Refactor keygen

Merged Chris Hines requested to merge refactor_keygen into dev

Merge request reports