checkpoint, depends on changes in gpg-wrapper

progress on #115, but there are still bugs