inter commit
Rebased to Master
Beta-ish tasks working.
Merge pull request #17 from Rough/tasks_functionality

Beta Tasks functionality