Refactored TaskManagerActual

Smarter adding methods now. (I thought I did these changes but they were
lost for some reason).