Can this TODO be sorted out yet? If not, let's add a card to Trello so it's not forgotten.