Work on #8

Just move those checks into kbpgp