nailing down bugs in the key structure ... :(