Cleaning up an error
Included more model view classes with getters/setters, modified existing ones to clean up code