I would hold off on making entries for the individual characters for a while. The two groups should be ok tho...