More on the service side
Clean up and Persistence Initial wiring