refactored the task stuff into a service
Merge branch 'master' into gh-pages