Started putting some code into the service and the model