Checkpoint commit, almost have the initial search research done. Don't forget to remove test keymap