Intemediate commit #3 - further work on services.