Moved TODO, added tasks