Major refactoring, Entity -> Character