Added finder stuff
Keyboard stuff