Work on migrating old key, and mouse handling