Going adress this as a part of https://trello.com/c/8UCEovv0/319-move-gpg-v2-controllers-to-v1