Feature/ianoc frozen keys

Merging Oscar's FrozenKey code with a few tests bring up to date with latest