work in progress on Keyboard handling