Service complete

IService/Service
Merge branch 'master' of https://github.com/cst326fields/cst326fields