Find a better way to handle Keys in the architect

[KellyLSB]

We needs to handle generation, management, and removal of keys better in our system.