More Changes, Zidane review the Key related classes.

Signed-off-by: Mike Howe <dockter@almuramc.com>