Added todos after talking to Max