Collate TaskManager to Michael
Merge branch 'working' of https://github.com/andhieka/LIST into working