Started on adding keys.
Merge from main.
Added Keys. Fixes #11 - Fixes #17