Update to design which means services are used instead of standard classes....

Update to design which means services are used instead of standard classes. This also means context can be obtained easily in these classes, however further issues with this solution are still to be resolved, mainly in the stimulus and stimulus strategy areas of the code.