More Stuff
more refactoring
Merge branch 'master' of github.com:hydrogadget/TaskManager