More redesign of the entity/character system