Moved TODO to Trello - private for now