Intemediate commit #5 - further work on services.