Resolve Trello stuff

Resolve some more Trello stuff