Save this for another pull request. Ill make a trello card.