Intemediate commit #4 - further work on services.