Tasks implemented
Merge pull request #2 from JonForest/Tasks

Tasks implemented