Removed todo comments and added to trello board