Added the start of an Entity Manager class, and made small changes to the Entity class.