Initial Editor and KeyHandler commit