Finished reversing the MVC model