Starting work on the services shim