Added new service code.
Improved service handling, now including live udpates\!
Merge branch 'test' into dev