Finished up Service class