Added todos as issues