Commiting progress on refactor to use personapgp.js