keytest working again.
uh-oh.
need less explodey error checking but this will do for now.