6th commit, working on keys