Main activity logic in place
Merge branch 'master' of https://github.com/PCannings/DWP