Allowed long-running tasks to be cancelled, added more TODOs for tasks that need completing, added more files from .idea folder.  Will be purging workspace.xml in the next commit as this is user-specific