- cleaning up some of the code

- rewriting the service store some what;