changes to services

@xuolives @fermat200pg  can you verify that these changes still need to be merged in? sorry we dropped the ball on this branch. if these are still good, then we'll merge into `test-ss` and continue development of service scheduler on that branch