Refactored Model classes and view controller

Refactored the two model classes that were pushed yesterday, and
updated the view controller that was using them as well.