Tasks: Cleaning up complex code for adding tasks
Merge branch 'master' of github.com:JonSEng/gp-taskmanagement