Added (hopefully) keyboard functionality