This is a big bit of work we need to do, so I've created a card here:

https://trello.com/c/Nsp6TOcr