Added Key Event Binding and minor testing