Database is now saving Correctly

Switched to entity model.