I think we shoul make a trello card for this