Still working on re-writing Tasks after user-modification... see TODOs