Entities, code cleanup

Cleaned up the code and added entities to replace my shifty and
ineffecient Characters class