Develop

Fixing object relationships in the database