Work in progress commit with more of the MVC model objects added