diff --git a/libraries/script-engine/src/AbstractControllerScriptingInterface.h b/libraries/script-engine/src/AbstractControllerScriptingInterface.h
index 1e9647c5d5..9f583b94d8 100644
--- a/libraries/script-engine/src/AbstractControllerScriptingInterface.h
+++ b/libraries/script-engine/src/AbstractControllerScriptingInterface.h
@@ -18,6 +18,7 @@
 #include <glm/gtc/quaternion.hpp>
 
 #include "EventTypes.h"
+#include "KeyEvent.h"
 
 class AbstractInputController : public QObject {
     Q_OBJECT
diff --git a/libraries/script-engine/src/EventTypes.cpp b/libraries/script-engine/src/EventTypes.cpp
index de3ec231ae..49c82796a2 100644
--- a/libraries/script-engine/src/EventTypes.cpp
+++ b/libraries/script-engine/src/EventTypes.cpp
@@ -11,291 +11,22 @@
 
 #include <QDebug>
 #include <RegisteredMetaTypes.h>
+
+#include "KeyEvent.h"
+
 #include "EventTypes.h"
 
 
 void registerEventTypes(QScriptEngine* engine) {
-    qScriptRegisterMetaType(engine, keyEventToScriptValue, keyEventFromScriptValue);
+    qScriptRegisterMetaType(engine, KeyEvent::toScriptValue, KeyEvent::fromScriptValue);
     qScriptRegisterMetaType(engine, mouseEventToScriptValue, mouseEventFromScriptValue);
     qScriptRegisterMetaType(engine, touchEventToScriptValue, touchEventFromScriptValue);
     qScriptRegisterMetaType(engine, wheelEventToScriptValue, wheelEventFromScriptValue);
     qScriptRegisterMetaType(engine, spatialEventToScriptValue, spatialEventFromScriptValue);
 }
 
-KeyEvent::KeyEvent() :
-    key(0),
-    text(""),
-    isShifted(false),
-    isControl(false),
-    isMeta(false),
-    isAlt(false),
-    isKeypad(false),
-    isValid(false),
-    isAutoRepeat(false)
-{
-};
 
 
-KeyEvent::KeyEvent(const QKeyEvent& event) {
-    key = event.key();
-    text = event.text();
-    isShifted = event.modifiers().testFlag(Qt::ShiftModifier);
-    isMeta = event.modifiers().testFlag(Qt::MetaModifier);
-    isControl = event.modifiers().testFlag(Qt::ControlModifier);
-    isAlt = event.modifiers().testFlag(Qt::AltModifier);
-    isKeypad = event.modifiers().testFlag(Qt::KeypadModifier);
-    isValid = true;
-    isAutoRepeat = event.isAutoRepeat();
-
-    // handle special text for special characters...
-    if (key == Qt::Key_F1) {
-        text = "F1";
-    } else if (key == Qt::Key_F2) {
-        text = "F2";
-    } else if (key == Qt::Key_F3) {
-        text = "F3";
-    } else if (key == Qt::Key_F4) {
-        text = "F4";
-    } else if (key == Qt::Key_F5) {
-        text = "F5";
-    } else if (key == Qt::Key_F6) {
-        text = "F6";
-    } else if (key == Qt::Key_F7) {
-        text = "F7";
-    } else if (key == Qt::Key_F8) {
-        text = "F8";
-    } else if (key == Qt::Key_F9) {
-        text = "F9";
-    } else if (key == Qt::Key_F10) {
-        text = "F10";
-    } else if (key == Qt::Key_F11) {
-        text = "F11";
-    } else if (key == Qt::Key_F12) {
-        text = "F12";
-    } else if (key == Qt::Key_Up) {
-        text = "UP";
-    } else if (key == Qt::Key_Down) {
-        text = "DOWN";
-    } else if (key == Qt::Key_Left) {
-        text = "LEFT";
-    } else if (key == Qt::Key_Right) {
-        text = "RIGHT";
-    } else if (key == Qt::Key_Space) {
-        text = "SPACE";
-    } else if (key == Qt::Key_Escape) {
-        text = "ESC";
-    } else if (key == Qt::Key_Tab) {
-        text = "TAB";
-    } else if (key == Qt::Key_Delete) {
-        text = "DELETE";
-    } else if (key == Qt::Key_Backspace) {
-        text = "BACKSPACE";
-    } else if (key == Qt::Key_Shift) {
-        text = "SHIFT";
-    } else if (key == Qt::Key_Alt) {
-        text = "ALT";
-    } else if (key == Qt::Key_Control) {
-        text = "CONTROL";
-    } else if (key == Qt::Key_Meta) {
-        text = "META";
-    } else if (key == Qt::Key_PageDown) {
-        text = "PAGE DOWN";
-    } else if (key == Qt::Key_PageUp) {
-        text = "PAGE UP";
-    } else if (key == Qt::Key_Home) {
-        text = "HOME";
-    } else if (key == Qt::Key_End) {
-        text = "END";
-    } else if (key == Qt::Key_Help) {
-        text = "HELP";
-    } else if (key == Qt::Key_CapsLock) {
-        text = "CAPS LOCK";
-    } else if (key >= Qt::Key_A && key <= Qt::Key_Z && (isMeta || isControl || isAlt))  {
-        // this little bit of hackery will fix the text character keys like a-z in cases of control/alt/meta where
-        // qt doesn't always give you the key characters and will sometimes give you crazy non-printable characters
-        const int lowerCaseAdjust = 0x20;
-        QString unicode;
-        if (isShifted) {
-            text = QString(QChar(key));
-        } else {
-            text = QString(QChar(key + lowerCaseAdjust));
-        }
-    }
-}
-
-bool KeyEvent::operator==(const KeyEvent& other) const { 
-    return other.key == key 
-        && other.isShifted == isShifted 
-        && other.isControl == isControl
-        && other.isMeta == isMeta
-        && other.isAlt == isAlt
-        && other.isKeypad == isKeypad
-        && other.isAutoRepeat == isAutoRepeat;
-}
-
-
-KeyEvent::operator QKeySequence() const { 
-    int resultCode = 0;
-    if (text.size() == 1 && text >= "a" && text <= "z") {
-        resultCode = text.toUpper().at(0).unicode();
-    } else {
-        resultCode = key;
-    }
-
-    if (isMeta) {
-        resultCode |= Qt::META;
-    }
-    if (isAlt) {
-        resultCode |= Qt::ALT;
-    }
-    if (isControl) {
-        resultCode |= Qt::CTRL;
-    }
-    if (isShifted) {
-        resultCode |= Qt::SHIFT;
-    }
-    return QKeySequence(resultCode);
-}
-
-QScriptValue keyEventToScriptValue(QScriptEngine* engine, const KeyEvent& event) {
-    QScriptValue obj = engine->newObject();
-    obj.setProperty("key", event.key);
-    obj.setProperty("text", event.text);
-    obj.setProperty("isShifted", event.isShifted);
-    obj.setProperty("isMeta", event.isMeta);
-    obj.setProperty("isControl", event.isControl);
-    obj.setProperty("isAlt", event.isAlt);
-    obj.setProperty("isKeypad", event.isKeypad);
-    obj.setProperty("isAutoRepeat", event.isAutoRepeat);
-    return obj;
-}
-
-void keyEventFromScriptValue(const QScriptValue& object, KeyEvent& event) {
-
-    event.isValid = false; // assume the worst
-    event.isMeta = object.property("isMeta").toVariant().toBool();
-    event.isControl = object.property("isControl").toVariant().toBool();
-    event.isAlt = object.property("isAlt").toVariant().toBool();
-    event.isKeypad = object.property("isKeypad").toVariant().toBool();
-    event.isAutoRepeat = object.property("isAutoRepeat").toVariant().toBool();
-
-    QScriptValue key = object.property("key");
-    if (key.isValid()) {
-        event.key = key.toVariant().toInt();
-        event.text = QString(QChar(event.key));
-        event.isValid = true;
-    } else {
-        QScriptValue text = object.property("text");
-        if (text.isValid()) {
-            event.text = object.property("text").toVariant().toString();
-            
-            // if the text is a special command, then map it here...
-            // TODO: come up with more elegant solution here, a map? is there a Qt function that gives nice names for keys?
-            if (event.text.toUpper() == "F1") {
-                event.key = Qt::Key_F1;
-            } else if (event.text.toUpper() == "F2") {
-                event.key = Qt::Key_F2;
-            } else if (event.text.toUpper() == "F3") {
-                event.key = Qt::Key_F3;
-            } else if (event.text.toUpper() == "F4") {
-                event.key = Qt::Key_F4;
-            } else if (event.text.toUpper() == "F5") {
-                event.key = Qt::Key_F5;
-            } else if (event.text.toUpper() == "F6") {
-                event.key = Qt::Key_F6;
-            } else if (event.text.toUpper() == "F7") {
-                event.key = Qt::Key_F7;
-            } else if (event.text.toUpper() == "F8") {
-                event.key = Qt::Key_F8;
-            } else if (event.text.toUpper() == "F9") {
-                event.key = Qt::Key_F9;
-            } else if (event.text.toUpper() == "F10") {
-                event.key = Qt::Key_F10;
-            } else if (event.text.toUpper() == "F11") {
-                event.key = Qt::Key_F11;
-            } else if (event.text.toUpper() == "F12") {
-                event.key = Qt::Key_F12;
-            } else if (event.text.toUpper() == "UP") {
-                event.key = Qt::Key_Up;
-                event.isKeypad = true;
-            } else if (event.text.toUpper() == "DOWN") {
-                event.key = Qt::Key_Down;
-                event.isKeypad = true;
-            } else if (event.text.toUpper() == "LEFT") {
-                event.key = Qt::Key_Left;
-                event.isKeypad = true;
-            } else if (event.text.toUpper() == "RIGHT") {
-                event.key = Qt::Key_Right;
-                event.isKeypad = true;
-            } else if (event.text.toUpper() == "SPACE") {
-                event.key = Qt::Key_Space;
-            } else if (event.text.toUpper() == "ESC") {
-                event.key = Qt::Key_Escape;
-            } else if (event.text.toUpper() == "TAB") {
-                event.key = Qt::Key_Tab;
-            } else if (event.text.toUpper() == "DELETE") {
-                event.key = Qt::Key_Delete;
-            } else if (event.text.toUpper() == "BACKSPACE") {
-                event.key = Qt::Key_Backspace;
-            } else if (event.text.toUpper() == "SHIFT") {
-                event.key = Qt::Key_Shift;
-            } else if (event.text.toUpper() == "ALT") {
-                event.key = Qt::Key_Alt;
-            } else if (event.text.toUpper() == "CONTROL") {
-                event.key = Qt::Key_Control;
-            } else if (event.text.toUpper() == "META") {
-                event.key = Qt::Key_Meta;
-            } else if (event.text.toUpper() == "PAGE DOWN") {
-                event.key = Qt::Key_PageDown;
-            } else if (event.text.toUpper() == "PAGE UP") {
-                event.key = Qt::Key_PageUp;
-            } else if (event.text.toUpper() == "HOME") {
-                event.key = Qt::Key_Home;
-            } else if (event.text.toUpper() == "END") {
-                event.key = Qt::Key_End;
-            } else if (event.text.toUpper() == "HELP") {
-                event.key = Qt::Key_Help;
-            } else if (event.text.toUpper() == "CAPS LOCK") {
-                event.key = Qt::Key_CapsLock;
-            } else {
-                // Key values do not distinguish between uppercase and lowercase
-                // and use the uppercase key value.
-                event.key = event.text.toUpper().at(0).unicode();
-            }
-            event.isValid = true;
-        }
-    }
-
-    QScriptValue isShifted = object.property("isShifted");
-    if (isShifted.isValid()) {
-        event.isShifted = isShifted.toVariant().toBool();
-    } else {
-        // if no isShifted was included, get it from the text
-        QChar character = event.text.at(0);
-        if (character.isLetter() && character.isUpper()) {
-            event.isShifted = true;
-        } else {
-            // if it's a symbol, then attempt to detect shifted-ness
-            if (QString("~!@#$%^&*()_+{}|:\"<>?").contains(character)) {
-                event.isShifted = true;
-            }
-        }
-    }
-    
-
-    const bool wantDebug = false;
-    if (wantDebug) {    
-        qDebug() << "event.key=" << event.key
-            << " event.text=" << event.text
-            << " event.isShifted=" << event.isShifted
-            << " event.isControl=" << event.isControl
-            << " event.isMeta=" << event.isMeta
-            << " event.isAlt=" << event.isAlt
-            << " event.isKeypad=" << event.isKeypad
-            << " event.isAutoRepeat=" << event.isAutoRepeat;
-    }
-}
-
 MouseEvent::MouseEvent() : 
     x(0.0f), 
     y(0.0f),
diff --git a/libraries/script-engine/src/EventTypes.h b/libraries/script-engine/src/EventTypes.h
index 959292039b..121c321cf6 100644
--- a/libraries/script-engine/src/EventTypes.h
+++ b/libraries/script-engine/src/EventTypes.h
@@ -17,31 +17,11 @@
 
 #include <QtScript/QScriptEngine>
 
-#include <QKeyEvent>
 #include <QMouseEvent>
 #include <QTouchEvent>
 #include <QWheelEvent>
 
 
-class KeyEvent {
-public:
-    KeyEvent();
-    KeyEvent(const QKeyEvent& event);
-    bool operator==(const KeyEvent& other) const;
-    operator QKeySequence() const;
-
-    int key;
-    QString text;
-    bool isShifted;
-    bool isControl;
-    bool isMeta;
-    bool isAlt;
-    bool isKeypad;
-    bool isValid;
-    bool isAutoRepeat;
-};
-
-
 class MouseEvent {
 public:
     MouseEvent(); 
@@ -123,8 +103,6 @@ public:
 private:
 };
 
-
-Q_DECLARE_METATYPE(KeyEvent)
 Q_DECLARE_METATYPE(MouseEvent)
 Q_DECLARE_METATYPE(TouchEvent)
 Q_DECLARE_METATYPE(WheelEvent)
@@ -132,8 +110,6 @@ Q_DECLARE_METATYPE(SpatialEvent)
 
 void registerEventTypes(QScriptEngine* engine);
 
-QScriptValue keyEventToScriptValue(QScriptEngine* engine, const KeyEvent& event);
-void keyEventFromScriptValue(const QScriptValue& object, KeyEvent& event);
 
 QScriptValue mouseEventToScriptValue(QScriptEngine* engine, const MouseEvent& event);
 void mouseEventFromScriptValue(const QScriptValue& object, MouseEvent& event);
diff --git a/libraries/script-engine/src/KeyEvent.cpp b/libraries/script-engine/src/KeyEvent.cpp
new file mode 100644
index 0000000000..b7564db1b6
--- /dev/null
+++ b/libraries/script-engine/src/KeyEvent.cpp
@@ -0,0 +1,290 @@
+//
+//  KeyEvent.cpp
+//  script-engine/src
+//
+//  Created by Stephen Birarda on 2014-10-27.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#include <qdebug.h>
+#include <qscriptengine.h>
+
+#include "KeyEvent.h"
+
+KeyEvent::KeyEvent() :
+    key(0),
+    text(""),
+    isShifted(false),
+    isControl(false),
+    isMeta(false),
+    isAlt(false),
+    isKeypad(false),
+    isValid(false),
+    isAutoRepeat(false)
+{
+    
+}
+
+KeyEvent::KeyEvent(const QKeyEvent& event) {
+    key = event.key();
+    text = event.text();
+    isShifted = event.modifiers().testFlag(Qt::ShiftModifier);
+    isMeta = event.modifiers().testFlag(Qt::MetaModifier);
+    isControl = event.modifiers().testFlag(Qt::ControlModifier);
+    isAlt = event.modifiers().testFlag(Qt::AltModifier);
+    isKeypad = event.modifiers().testFlag(Qt::KeypadModifier);
+    isValid = true;
+    isAutoRepeat = event.isAutoRepeat();
+    
+    // handle special text for special characters...
+    if (key == Qt::Key_F1) {
+        text = "F1";
+    } else if (key == Qt::Key_F2) {
+        text = "F2";
+    } else if (key == Qt::Key_F3) {
+        text = "F3";
+    } else if (key == Qt::Key_F4) {
+        text = "F4";
+    } else if (key == Qt::Key_F5) {
+        text = "F5";
+    } else if (key == Qt::Key_F6) {
+        text = "F6";
+    } else if (key == Qt::Key_F7) {
+        text = "F7";
+    } else if (key == Qt::Key_F8) {
+        text = "F8";
+    } else if (key == Qt::Key_F9) {
+        text = "F9";
+    } else if (key == Qt::Key_F10) {
+        text = "F10";
+    } else if (key == Qt::Key_F11) {
+        text = "F11";
+    } else if (key == Qt::Key_F12) {
+        text = "F12";
+    } else if (key == Qt::Key_Up) {
+        text = "UP";
+    } else if (key == Qt::Key_Down) {
+        text = "DOWN";
+    } else if (key == Qt::Key_Left) {
+        text = "LEFT";
+    } else if (key == Qt::Key_Right) {
+        text = "RIGHT";
+    } else if (key == Qt::Key_Space) {
+        text = "SPACE";
+    } else if (key == Qt::Key_Escape) {
+        text = "ESC";
+    } else if (key == Qt::Key_Tab) {
+        text = "TAB";
+    } else if (key == Qt::Key_Delete) {
+        text = "DELETE";
+    } else if (key == Qt::Key_Backspace) {
+        text = "BACKSPACE";
+    } else if (key == Qt::Key_Shift) {
+        text = "SHIFT";
+    } else if (key == Qt::Key_Alt) {
+        text = "ALT";
+    } else if (key == Qt::Key_Control) {
+        text = "CONTROL";
+    } else if (key == Qt::Key_Meta) {
+        text = "META";
+    } else if (key == Qt::Key_PageDown) {
+        text = "PAGE DOWN";
+    } else if (key == Qt::Key_PageUp) {
+        text = "PAGE UP";
+    } else if (key == Qt::Key_Home) {
+        text = "HOME";
+    } else if (key == Qt::Key_End) {
+        text = "END";
+    } else if (key == Qt::Key_Help) {
+        text = "HELP";
+    } else if (key == Qt::Key_CapsLock) {
+        text = "CAPS LOCK";
+    } else if (key >= Qt::Key_A && key <= Qt::Key_Z && (isMeta || isControl || isAlt))  {
+        // this little bit of hackery will fix the text character keys like a-z in cases of control/alt/meta where
+        // qt doesn't always give you the key characters and will sometimes give you crazy non-printable characters
+        const int lowerCaseAdjust = 0x20;
+        QString unicode;
+        if (isShifted) {
+            text = QString(QChar(key));
+        } else {
+            text = QString(QChar(key + lowerCaseAdjust));
+        }
+    }
+}
+
+bool KeyEvent::operator==(const KeyEvent& other) const {
+    return other.key == key
+    && other.isShifted == isShifted
+    && other.isControl == isControl
+    && other.isMeta == isMeta
+    && other.isAlt == isAlt
+    && other.isKeypad == isKeypad
+    && other.isAutoRepeat == isAutoRepeat;
+}
+
+
+KeyEvent::operator QKeySequence() const {
+    int resultCode = 0;
+    if (text.size() == 1 && text >= "a" && text <= "z") {
+        resultCode = text.toUpper().at(0).unicode();
+    } else {
+        resultCode = key;
+    }
+    
+    if (isMeta) {
+        resultCode |= Qt::META;
+    }
+    if (isAlt) {
+        resultCode |= Qt::ALT;
+    }
+    if (isControl) {
+        resultCode |= Qt::CTRL;
+    }
+    if (isShifted) {
+        resultCode |= Qt::SHIFT;
+    }
+    return QKeySequence(resultCode);
+}
+
+QScriptValue KeyEvent::toScriptValue(QScriptEngine* engine, const KeyEvent& event) {
+    QScriptValue obj = engine->newObject();
+    obj.setProperty("key", event.key);
+    obj.setProperty("text", event.text);
+    obj.setProperty("isShifted", event.isShifted);
+    obj.setProperty("isMeta", event.isMeta);
+    obj.setProperty("isControl", event.isControl);
+    obj.setProperty("isAlt", event.isAlt);
+    obj.setProperty("isKeypad", event.isKeypad);
+    obj.setProperty("isAutoRepeat", event.isAutoRepeat);
+    return obj;
+}
+
+void KeyEvent::fromScriptValue(const QScriptValue& object, KeyEvent& event) {
+    
+    event.isValid = false; // assume the worst
+    event.isMeta = object.property("isMeta").toVariant().toBool();
+    event.isControl = object.property("isControl").toVariant().toBool();
+    event.isAlt = object.property("isAlt").toVariant().toBool();
+    event.isKeypad = object.property("isKeypad").toVariant().toBool();
+    event.isAutoRepeat = object.property("isAutoRepeat").toVariant().toBool();
+    
+    QScriptValue key = object.property("key");
+    if (key.isValid()) {
+        event.key = key.toVariant().toInt();
+        event.text = QString(QChar(event.key));
+        event.isValid = true;
+    } else {
+        QScriptValue text = object.property("text");
+        if (text.isValid()) {
+            event.text = object.property("text").toVariant().toString();
+            
+            // if the text is a special command, then map it here...
+            // TODO: come up with more elegant solution here, a map? is there a Qt function that gives nice names for keys?
+            if (event.text.toUpper() == "F1") {
+                event.key = Qt::Key_F1;
+            } else if (event.text.toUpper() == "F2") {
+                event.key = Qt::Key_F2;
+            } else if (event.text.toUpper() == "F3") {
+                event.key = Qt::Key_F3;
+            } else if (event.text.toUpper() == "F4") {
+                event.key = Qt::Key_F4;
+            } else if (event.text.toUpper() == "F5") {
+                event.key = Qt::Key_F5;
+            } else if (event.text.toUpper() == "F6") {
+                event.key = Qt::Key_F6;
+            } else if (event.text.toUpper() == "F7") {
+                event.key = Qt::Key_F7;
+            } else if (event.text.toUpper() == "F8") {
+                event.key = Qt::Key_F8;
+            } else if (event.text.toUpper() == "F9") {
+                event.key = Qt::Key_F9;
+            } else if (event.text.toUpper() == "F10") {
+                event.key = Qt::Key_F10;
+            } else if (event.text.toUpper() == "F11") {
+                event.key = Qt::Key_F11;
+            } else if (event.text.toUpper() == "F12") {
+                event.key = Qt::Key_F12;
+            } else if (event.text.toUpper() == "UP") {
+                event.key = Qt::Key_Up;
+                event.isKeypad = true;
+            } else if (event.text.toUpper() == "DOWN") {
+                event.key = Qt::Key_Down;
+                event.isKeypad = true;
+            } else if (event.text.toUpper() == "LEFT") {
+                event.key = Qt::Key_Left;
+                event.isKeypad = true;
+            } else if (event.text.toUpper() == "RIGHT") {
+                event.key = Qt::Key_Right;
+                event.isKeypad = true;
+            } else if (event.text.toUpper() == "SPACE") {
+                event.key = Qt::Key_Space;
+            } else if (event.text.toUpper() == "ESC") {
+                event.key = Qt::Key_Escape;
+            } else if (event.text.toUpper() == "TAB") {
+                event.key = Qt::Key_Tab;
+            } else if (event.text.toUpper() == "DELETE") {
+                event.key = Qt::Key_Delete;
+            } else if (event.text.toUpper() == "BACKSPACE") {
+                event.key = Qt::Key_Backspace;
+            } else if (event.text.toUpper() == "SHIFT") {
+                event.key = Qt::Key_Shift;
+            } else if (event.text.toUpper() == "ALT") {
+                event.key = Qt::Key_Alt;
+            } else if (event.text.toUpper() == "CONTROL") {
+                event.key = Qt::Key_Control;
+            } else if (event.text.toUpper() == "META") {
+                event.key = Qt::Key_Meta;
+            } else if (event.text.toUpper() == "PAGE DOWN") {
+                event.key = Qt::Key_PageDown;
+            } else if (event.text.toUpper() == "PAGE UP") {
+                event.key = Qt::Key_PageUp;
+            } else if (event.text.toUpper() == "HOME") {
+                event.key = Qt::Key_Home;
+            } else if (event.text.toUpper() == "END") {
+                event.key = Qt::Key_End;
+            } else if (event.text.toUpper() == "HELP") {
+                event.key = Qt::Key_Help;
+            } else if (event.text.toUpper() == "CAPS LOCK") {
+                event.key = Qt::Key_CapsLock;
+            } else {
+                // Key values do not distinguish between uppercase and lowercase
+                // and use the uppercase key value.
+                event.key = event.text.toUpper().at(0).unicode();
+            }
+            event.isValid = true;
+        }
+    }
+    
+    QScriptValue isShifted = object.property("isShifted");
+    if (isShifted.isValid()) {
+        event.isShifted = isShifted.toVariant().toBool();
+    } else {
+        // if no isShifted was included, get it from the text
+        QChar character = event.text.at(0);
+        if (character.isLetter() && character.isUpper()) {
+            event.isShifted = true;
+        } else {
+            // if it's a symbol, then attempt to detect shifted-ness
+            if (QString("~!@#$%^&*()_+{}|:\"<>?").contains(character)) {
+                event.isShifted = true;
+            }
+        }
+    }
+    
+    
+    const bool wantDebug = false;
+    if (wantDebug) {
+        qDebug() << "event.key=" << event.key
+        << " event.text=" << event.text
+        << " event.isShifted=" << event.isShifted
+        << " event.isControl=" << event.isControl
+        << " event.isMeta=" << event.isMeta
+        << " event.isAlt=" << event.isAlt
+        << " event.isKeypad=" << event.isKeypad
+        << " event.isAutoRepeat=" << event.isAutoRepeat;
+    }
+}
+
diff --git a/libraries/script-engine/src/KeyEvent.h b/libraries/script-engine/src/KeyEvent.h
new file mode 100644
index 0000000000..bdadcec374
--- /dev/null
+++ b/libraries/script-engine/src/KeyEvent.h
@@ -0,0 +1,41 @@
+//
+//  KeyEvent.h
+//  script-engine/src
+//
+//  Created by Stephen Birarda on 2014-10-27.
+//  Copyright 2014 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_KeyEvent_h
+#define hifi_KeyEvent_h
+
+#include <QKeyEvent>
+#include <qscriptvalue.h>
+
+class KeyEvent {
+public:
+    KeyEvent();
+    KeyEvent(const QKeyEvent& event);
+    bool operator==(const KeyEvent& other) const;
+    operator QKeySequence() const;
+    
+    static QScriptValue toScriptValue(QScriptEngine* engine, const KeyEvent& event);
+    static void fromScriptValue(const QScriptValue& object, KeyEvent& event);
+    
+    int key;
+    QString text;
+    bool isShifted;
+    bool isControl;
+    bool isMeta;
+    bool isAlt;
+    bool isKeypad;
+    bool isValid;
+    bool isAutoRepeat;
+};
+
+Q_DECLARE_METATYPE(KeyEvent)
+
+#endif // hifi_KeyEvent_h
\ No newline at end of file
diff --git a/libraries/script-engine/src/MenuItemProperties.cpp b/libraries/script-engine/src/MenuItemProperties.cpp
index c1f3e92447..97fbdef1fa 100644
--- a/libraries/script-engine/src/MenuItemProperties.cpp
+++ b/libraries/script-engine/src/MenuItemProperties.cpp
@@ -82,7 +82,7 @@ void menuItemPropertiesFromScriptValue(const QScriptValue& object, MenuItemPrope
     } else {
         QScriptValue shortcutKeyEventValue = object.property("shortcutKeyEvent");
         if (shortcutKeyEventValue.isValid()) {
-            keyEventFromScriptValue(shortcutKeyEventValue, properties.shortcutKeyEvent);
+            KeyEvent::fromScriptValue(shortcutKeyEventValue, properties.shortcutKeyEvent);
             properties.shortcutKeySequence = properties.shortcutKeyEvent;
         }
     }
diff --git a/libraries/script-engine/src/MenuItemProperties.h b/libraries/script-engine/src/MenuItemProperties.h
index 9dd3c6107c..889fb3855a 100644
--- a/libraries/script-engine/src/MenuItemProperties.h
+++ b/libraries/script-engine/src/MenuItemProperties.h
@@ -14,7 +14,7 @@
 
 #include <QtScript/QScriptEngine>
 
-#include "EventTypes.h"
+#include "KeyEvent.h"
 
 const int UNSPECIFIED_POSITION = -1;