Did a number of refactorings to better handle large amounts of tasks