Added Tasks and TODOs