Global testing - pre service switch

All global variables will now be stored in a service dictionary. This
coding is now commencing after this commit.