Now has rudimentary ability to edit an entity and create a new entity