Added ToDo's and comments for next steps.