Entity structure changes
Mid-way through being able to add and edit an entity