Major refactor on tasks - Fixes #2 #6 #7 (and possibly others)