Refactoring so that saving / deleting / getting is done on the models struct. WIP.