Refactored everything
Merge pull request #1 from gregdaynes/split-tasks

Refactored everything