WIP: Code conventions, consistency across classes, Entity class is starting to take a good shape.