adding more key management stuff, it's gotten too complicated!
renames
some progress
progress on issue #27.  we're still failing though.
bugfixes and progress
a reshuffle
checkpoint
progress, and bugfixes
ok, it works, onto the next problem