Finishing most of the service classes
Adding files that were untracked