Changed the ViewControllers to use the Model services. There is a big bug still