Update with the Service Classes

Get up to date with our new and exciting changes to the service classes