Updated to create entities

Still needs work, polymorphism not implemented correctly