Started sorting out key mgmt
Merge branch 'master' of https://github.com/accidentalManual/1653