Working on the keys
Key works
Fixed merge conflicts