Working on moving some stuff to the service.
Fixing tests and finishing up work on making a service