Beginning of entity creation

Still needs work