Preparing a true id-key (I hope) implementation.