diff --git a/examples/example/entities/butterflies.js b/examples/example/entities/butterflies.js
index 3a78a2fc1c..9d53fc0ebf 100644
--- a/examples/example/entities/butterflies.js
+++ b/examples/example/entities/butterflies.js
@@ -32,7 +32,7 @@ function randVector(a, b) {
 
 var startTimeInSeconds = new Date().getTime() / 1000;
 
-var NATURAL_SIZE_OF_BUTTERFLY = { x: 1.0, y: 0.4, z: 0.2 };
+var NATURAL_SIZE_OF_BUTTERFLY = { x:0.5, y: 0.2, z: 0.1 };
 
 var lifeTime = 3600; // One hour lifespan
 var range = 7.0; // Over what distance in meters do you want the flock to fly around
@@ -65,8 +65,8 @@ function addButterfly() {
     var color = { red: 100, green: 100, blue: 100 };
     var size = 0;
 
-    var MINSIZE = 0.06;
-    var RANGESIZE = 0.2;
+    var MINSIZE = 0.01;
+    var RANGESIZE = 0.05;
     var maxSize = MINSIZE + RANGESIZE;
     
     size = MINSIZE + Math.random() * RANGESIZE;
@@ -74,7 +74,7 @@ function addButterfly() {
     var dimensions = Vec3.multiply(NATURAL_SIZE_OF_BUTTERFLY, (size / maxSize));
         
     var GRAVITY = -0.2;
-    var newFrameRate = 20 + Math.random() * 30;
+    var newFrameRate = 29 + Math.random() * 30;
     var properties = {
         type: "Model",
         lifetime: lifeTime,
@@ -86,17 +86,13 @@ function addButterfly() {
         dimensions: dimensions,
         color: color,
         animation: { 
-            url: "http://public.highfidelity.io/models/content/butterfly/butterfly.fbx",
-            firstFrame: 0,
+            url: "http://hifi-content.s3.amazonaws.com/james/butterfly/butterfly.fbx",
             fps: newFrameRate,
-            currentFrame: 0,
-            hold: false,
-            lastFrame: 10000,
             loop: true,
             running: true,
             startAutomatically:false
         },
-        modelURL: "http://public.highfidelity.io/models/content/butterfly/butterfly.fbx"
+        modelURL: "http://hifi-content.s3.amazonaws.com/james/butterfly/butterfly.fbx"
     };
     butterflies.push(Entities.addEntity(properties));
 }
diff --git a/examples/toybox/basketball/createSingleBasketball.js b/examples/toybox/basketball/createSingleBasketball.js
index a1e0140553..6765e5e075 100644
--- a/examples/toybox/basketball/createSingleBasketball.js
+++ b/examples/toybox/basketball/createSingleBasketball.js
@@ -47,7 +47,12 @@ function makeBasketball() {
         modelURL: basketballURL,
         restitution: 1.0,
         damping: 0.00001,
-        shapeType: "sphere"
+        shapeType: "sphere",
+        userData: JSON.stringify({
+            grabbableKey: {
+                invertSolidWhileHeld: true
+            }
+        })
     });
     originalPosition = position;
 }
diff --git a/examples/toybox/doll/createDoll.js b/examples/toybox/doll/createDoll.js
index ffd840f4ea..52ba5a5291 100644
--- a/examples/toybox/doll/createDoll.js
+++ b/examples/toybox/doll/createDoll.js
@@ -15,12 +15,20 @@ function createDoll() {
 
     var scriptURL = Script.resolvePath("doll.js");
 
-    var center = Vec3.sum(Vec3.sum(MyAvatar.position, { x: 0, y: 0.5, z: 0 }), Vec3.multiply(0.5, Quat.getFront(Camera.getOrientation())));
+    var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
+        x: 0,
+        y: 0.5,
+        z: 0
+    }), Vec3.multiply(0.5, Quat.getFront(Camera.getOrientation())));
 
-    var naturalDimensions = { x: 1.63, y: 1.67, z: 0.26};
+    var naturalDimensions = {
+        x: 1.63,
+        y: 1.67,
+        z: 0.26
+    };
 
     var desiredDimensions = Vec3.multiply(naturalDimensions, 0.15);
-    
+
     var doll = Entities.addEntity({
         type: "Model",
         name: "doll",
@@ -39,7 +47,12 @@ function createDoll() {
             y: 0,
             z: 0
         },
-        collisionsWillMove: true
+        collisionsWillMove: true,
+        userData: JSON.stringify({
+            grabbableKey: {
+                invertSolidWhileHeld: true
+            }
+        })
     });
     return doll;
 }
diff --git a/examples/toybox/flashlight/createFlashlight.js b/examples/toybox/flashlight/createFlashlight.js
index b049d2632e..108d519d3e 100644
--- a/examples/toybox/flashlight/createFlashlight.js
+++ b/examples/toybox/flashlight/createFlashlight.js
@@ -18,14 +18,27 @@ var scriptURL = Script.resolvePath('flashlight.js');
 
 var modelURL = "https://hifi-public.s3.amazonaws.com/models/props/flashlight.fbx";
 
-var center = Vec3.sum(Vec3.sum(MyAvatar.position, {x: 0, y: 0.5, z: 0}), Vec3.multiply(0.5, Quat.getFront(Camera.getOrientation())));
+var center = Vec3.sum(Vec3.sum(MyAvatar.position, {
+    x: 0,
+    y: 0.5,
+    z: 0
+}), Vec3.multiply(0.5, Quat.getFront(Camera.getOrientation())));
 
 var flashlight = Entities.addEntity({
     type: "Model",
     modelURL: modelURL,
     position: center,
-    dimensions: { x: 0.08, y: 0.30, z: 0.08},
+    dimensions: {
+        x: 0.08,
+        y: 0.30,
+        z: 0.08
+    },
     collisionsWillMove: true,
     shapeType: 'box',
-    script: scriptURL
-});
+    script: scriptURL,
+    userData: JSON.stringify({
+        grabbableKey: {
+            invertSolidWhileHeld: true
+        }
+    })
+});
\ No newline at end of file
diff --git a/examples/toybox/ping_pong_gun/createPingPongGun.js b/examples/toybox/ping_pong_gun/createPingPongGun.js
index 705671e784..4b93842896 100644
--- a/examples/toybox/ping_pong_gun/createPingPongGun.js
+++ b/examples/toybox/ping_pong_gun/createPingPongGun.js
@@ -35,7 +35,12 @@ var pingPongGun = Entities.addEntity({
         z: 0.47
     },
     collisionsWillMove: true,
-    collisionSoundURL: COLLISION_SOUND_URL
+    collisionSoundURL: COLLISION_SOUND_URL,
+    userData: JSON.stringify({
+        grabbableKey: {
+            invertSolidWhileHeld: true
+        }
+    })
 });
 
 function cleanUp() {
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 053ef5b7a7..199fdecb8e 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -78,7 +78,7 @@
 #include <ObjectMotionState.h>
 #include <OctalCode.h>
 #include <OctreeSceneStats.h>
-#include <gl/OffscreenGlCanvas.h>
+#include <gl/OffscreenGLCanvas.h>
 #include <PathUtils.h>
 #include <PerfStat.h>
 #include <PhysicsEngine.h>
@@ -616,7 +616,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     // enable mouse tracking; otherwise, we only get drag events
     _glWidget->setMouseTracking(true);
 
-    _offscreenContext = new OffscreenGlCanvas();
+    _offscreenContext = new OffscreenGLCanvas();
     _offscreenContext->create(_glWidget->context()->contextHandle());
     _offscreenContext->makeCurrent();
     initializeGL();
diff --git a/interface/src/Application.h b/interface/src/Application.h
index 730158c689..6e8df65032 100644
--- a/interface/src/Application.h
+++ b/interface/src/Application.h
@@ -65,7 +65,7 @@
 #include "ui/ToolWindow.h"
 #include "UndoStackScriptingInterface.h"
 
-class OffscreenGlCanvas;
+class OffscreenGLCanvas;
 class GLCanvas;
 class FaceTracker;
 class MainWindow;
@@ -421,7 +421,7 @@ private:
 
     bool _dependencyManagerIsSetup;
 
-    OffscreenGlCanvas* _offscreenContext { nullptr };
+    OffscreenGLCanvas* _offscreenContext { nullptr };
     DisplayPluginPointer _displayPlugin;
     InputPluginList _activeInputPlugins;
 
diff --git a/interface/src/GLCanvas.cpp b/interface/src/GLCanvas.cpp
index d9cde868a9..0b4c6dde3d 100644
--- a/interface/src/GLCanvas.cpp
+++ b/interface/src/GLCanvas.cpp
@@ -9,54 +9,15 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+// FIXME ordering of headers
 #include "Application.h"
 #include "GLCanvas.h"
 
-#include <QMimeData>
-#include <QUrl>
 #include <QWindow>
 
 #include "MainWindow.h"
 #include "Menu.h"
 
-static QGLFormat& getDesiredGLFormat() {
-    // Specify an OpenGL 3.3 format using the Core profile.
-    // That is, no old-school fixed pipeline functionality
-    static QGLFormat glFormat;
-    static std::once_flag once;
-    std::call_once(once, [] {
-        glFormat.setVersion(4, 1);
-        glFormat.setProfile(QGLFormat::CoreProfile); // Requires >=Qt-4.8.0
-        glFormat.setSampleBuffers(false);
-        glFormat.setDepth(false);
-        glFormat.setStencil(false);
-    });
-    return glFormat;
-}
-
-GLCanvas::GLCanvas() : QGLWidget(getDesiredGLFormat()) {
-#ifdef Q_OS_LINUX
-    // Cause GLCanvas::eventFilter to be called.
-    // It wouldn't hurt to do this on Mac and PC too; but apparently it's only needed on linux.
-    qApp->installEventFilter(this);
-#endif
-}
-
-int GLCanvas::getDeviceWidth() const {
-    return width() * (windowHandle() ? (float)windowHandle()->devicePixelRatio() : 1.0f);
-}
-
-int GLCanvas::getDeviceHeight() const {
-    return height() * (windowHandle() ? (float)windowHandle()->devicePixelRatio() : 1.0f);
-}
-
-void GLCanvas::initializeGL() {
-    setAttribute(Qt::WA_AcceptTouchEvents);
-    setAcceptDrops(true);
-    // Note, we *DO NOT* want Qt to automatically swap buffers for us.  This results in the "ringing" bug mentioned in WL#19514 when we're throttling the framerate.
-    setAutoBufferSwap(false);
-}
-
 void GLCanvas::paintGL() {
     PROFILE_RANGE(__FUNCTION__);
     
@@ -74,68 +35,8 @@ void GLCanvas::resizeGL(int width, int height) {
 }
 
 bool GLCanvas::event(QEvent* event) {
-    switch (event->type()) {
-        case QEvent::MouseMove:
-        case QEvent::MouseButtonPress:
-        case QEvent::MouseButtonRelease:
-        case QEvent::MouseButtonDblClick:
-        case QEvent::KeyPress:
-        case QEvent::KeyRelease:
-        case QEvent::FocusIn:
-        case QEvent::FocusOut:
-        case QEvent::Resize:
-        case QEvent::TouchBegin:
-        case QEvent::TouchEnd:
-        case QEvent::TouchUpdate:
-        case QEvent::Wheel:
-        case QEvent::DragEnter:
-        case QEvent::Drop:
-            if (QCoreApplication::sendEvent(QCoreApplication::instance(), event)) {
-                return true;
-            }
-            break;
-        case QEvent::Paint:
-            // Ignore paint events that occur after we've decided to quit
-            if (qApp->isAboutToQuit()) {
-                return true;
-            }
-            break;
-
-        default:
-            break;
+    if (QEvent::Paint == event->type() && qApp->isAboutToQuit()) {
+        return true;
     }
-    return QGLWidget::event(event);
-}
-
-
-// Pressing Alt (and Meta) key alone activates the menubar because its style inherits the
-// SHMenuBarAltKeyNavigation from QWindowsStyle. This makes it impossible for a scripts to
-// receive keyPress events for the Alt (and Meta) key in a reliable manner.
-//
-// This filter catches events before QMenuBar can steal the keyboard focus.
-// The idea was borrowed from
-// http://www.archivum.info/qt-interest@trolltech.com/2006-09/00053/Re-(Qt4)-Alt-key-focus-QMenuBar-(solved).html
-
-bool GLCanvas::eventFilter(QObject*, QEvent* event) {
-    switch (event->type()) {
-        case QEvent::KeyPress:
-        case QEvent::KeyRelease:
-        case QEvent::ShortcutOverride:
-        {
-            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
-            if (keyEvent->key() == Qt::Key_Alt || keyEvent->key() == Qt::Key_Meta) {
-                if (event->type() == QEvent::KeyPress) {
-                    keyPressEvent(keyEvent);
-                } else if (event->type() == QEvent::KeyRelease) {
-                    keyReleaseEvent(keyEvent);
-                } else {
-                    QGLWidget::event(event);
-                }
-                return true;
-            }
-        }
-        default:
-            break;
-    }
-    return false;
+    return GLWidget::event(event);
 }
diff --git a/interface/src/GLCanvas.h b/interface/src/GLCanvas.h
index 73c5b5e8bf..0442159eeb 100644
--- a/interface/src/GLCanvas.h
+++ b/interface/src/GLCanvas.h
@@ -12,31 +12,15 @@
 #ifndef hifi_GLCanvas_h
 #define hifi_GLCanvas_h
 
-#include <QDebug>
-#include <QGLWidget>
-#include <QTimer>
+#include <gl/GLWidget.h>
 
 /// customized canvas that simply forwards requests/events to the singleton application
-class GLCanvas : public QGLWidget {
+class GLCanvas : public GLWidget {
     Q_OBJECT
-    
-public:
-    GLCanvas();
-
-    int getDeviceWidth() const;
-    int getDeviceHeight() const;
-    QSize getDeviceSize() const { return QSize(getDeviceWidth(), getDeviceHeight()); }
-    
 protected:
-
-    virtual void initializeGL();
-    virtual void paintGL();
-    virtual void resizeGL(int width, int height);
-    virtual bool event(QEvent* event);
-
-private slots:
-    bool eventFilter(QObject*, QEvent* event);
-   
+    virtual void paintGL() override;
+    virtual void resizeGL(int width, int height) override;
+    virtual bool event(QEvent* event) override;
 };
 
 
diff --git a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
index 3ef882fe76..01cb0961e4 100644
--- a/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/OpenGLDisplayPlugin.cpp
@@ -10,7 +10,6 @@
 #include <QCoreApplication>
 
 #include <gl/Config.h>
-#include <gl/GlWindow.h>
 #include <GLMHelpers.h>
 
 
diff --git a/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp
index bb39c7bb7a..4278165e25 100644
--- a/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/openvr/OpenVrDisplayPlugin.cpp
@@ -14,7 +14,6 @@
 #include <QMainWindow>
 #include <QGLWidget>
 #include <GLMHelpers.h>
-#include <gl/GlWindow.h>
 #include <QEvent>
 #include <QResizeEvent>
 
diff --git a/libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.cpp
index 6e14a158d4..72921b4f90 100644
--- a/libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/stereo/InterleavedStereoDisplayPlugin.cpp
@@ -8,15 +8,6 @@
 
 #include "InterleavedStereoDisplayPlugin.h"
 
-#include <QApplication>
-#include <QDesktopWidget>
-
-#include <gl/GlWindow.h>
-#include <ViewFrustum.h>
-#include <MatrixStack.h>
-
-#include <gpu/GLBackend.h>
-
 static const char * INTERLEAVED_TEXTURED_VS = R"VS(#version 410 core
 #pragma line __LINE__
 
@@ -81,4 +72,4 @@ void InterleavedStereoDisplayPlugin::display(
     _program->Bind();
     Uniform<ivec2>(*_program, "textureSize").SetValue(sceneSize);
     WindowOpenGLDisplayPlugin::display(finalTexture, sceneSize);
-}
\ No newline at end of file
+}
diff --git a/libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.cpp b/libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.cpp
index 5ba113420d..12865cf4cd 100644
--- a/libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.cpp
+++ b/libraries/display-plugins/src/display-plugins/stereo/SideBySideStereoDisplayPlugin.cpp
@@ -7,17 +7,7 @@
 //
 
 #include "SideBySideStereoDisplayPlugin.h"
-
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QScreen>
-
-#include <gl/GlWindow.h>
-#include <ViewFrustum.h>
-#include <MatrixStack.h>
-
-#include <gpu/GLBackend.h>
-#include <plugins/PluginContainer.h>
+#include <GLMHelpers.h>
 
 const QString SideBySideStereoDisplayPlugin::NAME("3D TV - Side by Side Stereo");
 
diff --git a/libraries/gl/src/gl/GLEscrow.h b/libraries/gl/src/gl/GLEscrow.h
index 54b124ae3c..db9f033de8 100644
--- a/libraries/gl/src/gl/GLEscrow.h
+++ b/libraries/gl/src/gl/GLEscrow.h
@@ -87,6 +87,11 @@ public:
         _recycler = recycler;
     }
 
+    size_t depth() {
+        Lock lock(_mutex);
+        return _submits.size();
+    }
+
     // Submit a new resource from the producer context
     // returns the number of prior submissions that were
     // never consumed before becoming available.
@@ -124,7 +129,7 @@ public:
         }
         return result;
     }
-    
+
     // If fetch returns a non-zero value, it's the responsibility of the
     // client to release it at some point
     void release(T t, GLsync readSync = 0) {
@@ -175,6 +180,7 @@ private:
 
     // May be called on any thread, but must be inside a locked section
     void pop(Deque& deque) {
+        Lock lock(_mutex);
         auto& item = deque.front();
         _trash.push_front(item);
         deque.pop_front();
diff --git a/libraries/gl/src/gl/GLHelpers.cpp b/libraries/gl/src/gl/GLHelpers.cpp
index f67f9e9120..6ad7f816b8 100644
--- a/libraries/gl/src/gl/GLHelpers.cpp
+++ b/libraries/gl/src/gl/GLHelpers.cpp
@@ -1,15 +1,37 @@
 #include "GLHelpers.h"
 
+#include <mutex>
 
-QSurfaceFormat getDefaultOpenGlSurfaceFormat() {
-   QSurfaceFormat format;
-   // Qt Quick may need a depth and stencil buffer. Always make sure these are available.
-   format.setDepthBufferSize(DEFAULT_GL_DEPTH_BUFFER_BITS);
-   format.setStencilBufferSize(DEFAULT_GL_STENCIL_BUFFER_BITS);
-   format.setVersion(4, 1);
+#include <QtGui/QSurfaceFormat>
+#include <QtOpenGL/QGL>
+
+const QSurfaceFormat& getDefaultOpenGLSurfaceFormat() {
+    static QSurfaceFormat format;
+    static std::once_flag once;
+    std::call_once(once, [] {
+        // Qt Quick may need a depth and stencil buffer. Always make sure these are available.
+        format.setDepthBufferSize(DEFAULT_GL_DEPTH_BUFFER_BITS);
+        format.setStencilBufferSize(DEFAULT_GL_STENCIL_BUFFER_BITS);
+        format.setVersion(4, 1);
 #ifdef DEBUG
-   format.setOption(QSurfaceFormat::DebugContext);
+        format.setOption(QSurfaceFormat::DebugContext);
 #endif
-   format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
-   return format;
+        format.setProfile(QSurfaceFormat::OpenGLContextProfile::CoreProfile);
+    });
+    return format;
+}
+
+const QGLFormat& getDefaultGLFormat() {
+    // Specify an OpenGL 3.3 format using the Core profile.
+    // That is, no old-school fixed pipeline functionality
+    static QGLFormat glFormat;
+    static std::once_flag once;
+    std::call_once(once, [] {
+        glFormat.setVersion(4, 1);
+        glFormat.setProfile(QGLFormat::CoreProfile); // Requires >=Qt-4.8.0
+        glFormat.setSampleBuffers(false);
+        glFormat.setDepth(false);
+        glFormat.setStencil(false);
+    });
+    return glFormat;
 }
diff --git a/libraries/gl/src/gl/GLHelpers.h b/libraries/gl/src/gl/GLHelpers.h
index dc9f0f3140..335272d991 100644
--- a/libraries/gl/src/gl/GLHelpers.h
+++ b/libraries/gl/src/gl/GLHelpers.h
@@ -10,14 +10,15 @@
 #ifndef hifi_GLHelpers_h
 #define hifi_GLHelpers_h
 
-#include <QSurfaceFormat>
-
 // 16 bits of depth precision
 #define DEFAULT_GL_DEPTH_BUFFER_BITS 16
 // 8 bits of stencil buffer (typically you really only need 1 bit for functionality
 // but GL implementations usually just come with buffer sizes in multiples of 8)
 #define DEFAULT_GL_STENCIL_BUFFER_BITS 8
 
-QSurfaceFormat getDefaultOpenGlSurfaceFormat();
+class QSurfaceFormat;
+class QGLFormat;
 
+const QSurfaceFormat& getDefaultOpenGLSurfaceFormat();
+const QGLFormat& getDefaultGLFormat();
 #endif
diff --git a/libraries/gl/src/gl/GLWidget.cpp b/libraries/gl/src/gl/GLWidget.cpp
new file mode 100644
index 0000000000..310675c01f
--- /dev/null
+++ b/libraries/gl/src/gl/GLWidget.cpp
@@ -0,0 +1,114 @@
+//
+//
+//  Created by Bradley Austin Davis on 2015/12/03
+//  Derived from interface/src/GLCanvas.cpp created by Stephen Birarda on 8/14/13.
+//  Copyright 2013-2015 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 "GLWidget.h"
+
+#include <mutex>
+
+#include <QtCore/QMimeData>
+#include <QtCore/QUrl>
+#include <QtCore/QCoreApplication>
+
+#include <QtGui/QKeyEvent>
+#include <QtGui/QWindow>
+
+#include "GLHelpers.h"
+
+GLWidget::GLWidget() : QGLWidget(getDefaultGLFormat()) {
+#ifdef Q_OS_LINUX
+    // Cause GLWidget::eventFilter to be called.
+    // It wouldn't hurt to do this on Mac and PC too; but apparently it's only needed on linux.
+    qApp->installEventFilter(this);
+#endif
+}
+
+int GLWidget::getDeviceWidth() const {
+    return width() * (windowHandle() ? (float)windowHandle()->devicePixelRatio() : 1.0f);
+}
+
+int GLWidget::getDeviceHeight() const {
+    return height() * (windowHandle() ? (float)windowHandle()->devicePixelRatio() : 1.0f);
+}
+
+void GLWidget::initializeGL() {
+    setAttribute(Qt::WA_AcceptTouchEvents);
+    setAcceptDrops(true);
+    // Note, we *DO NOT* want Qt to automatically swap buffers for us.  This results in the "ringing" bug mentioned in WL#19514 when we're throttling the framerate.
+    setAutoBufferSwap(false);
+}
+
+void GLWidget::paintEvent(QPaintEvent* event) {
+    QWidget::paintEvent(event);
+}
+
+void GLWidget::resizeEvent(QResizeEvent* event) {
+    QWidget::resizeEvent(event);
+}
+
+bool GLWidget::event(QEvent* event) {
+    switch (event->type()) {
+        case QEvent::MouseMove:
+        case QEvent::MouseButtonPress:
+        case QEvent::MouseButtonRelease:
+        case QEvent::MouseButtonDblClick:
+        case QEvent::KeyPress:
+        case QEvent::KeyRelease:
+        case QEvent::FocusIn:
+        case QEvent::FocusOut:
+        case QEvent::Resize:
+        case QEvent::TouchBegin:
+        case QEvent::TouchEnd:
+        case QEvent::TouchUpdate:
+        case QEvent::Wheel:
+        case QEvent::DragEnter:
+        case QEvent::Drop:
+            if (QCoreApplication::sendEvent(QCoreApplication::instance(), event)) {
+                return true;
+            }
+            break;
+
+        default:
+            break;
+    }
+    return QGLWidget::event(event);
+}
+
+
+// Pressing Alt (and Meta) key alone activates the menubar because its style inherits the
+// SHMenuBarAltKeyNavigation from QWindowsStyle. This makes it impossible for a scripts to
+// receive keyPress events for the Alt (and Meta) key in a reliable manner.
+//
+// This filter catches events before QMenuBar can steal the keyboard focus.
+// The idea was borrowed from
+// http://www.archivum.info/qt-interest@trolltech.com/2006-09/00053/Re-(Qt4)-Alt-key-focus-QMenuBar-(solved).html
+
+bool GLWidget::eventFilter(QObject*, QEvent* event) {
+    switch (event->type()) {
+        case QEvent::KeyPress:
+        case QEvent::KeyRelease:
+        case QEvent::ShortcutOverride:
+        {
+            QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+            if (keyEvent->key() == Qt::Key_Alt || keyEvent->key() == Qt::Key_Meta) {
+                if (event->type() == QEvent::KeyPress) {
+                    keyPressEvent(keyEvent);
+                } else if (event->type() == QEvent::KeyRelease) {
+                    keyReleaseEvent(keyEvent);
+                } else {
+                    QGLWidget::event(event);
+                }
+                return true;
+            }
+        }
+        default:
+            break;
+    }
+    return false;
+}
diff --git a/libraries/gl/src/gl/GLWidget.h b/libraries/gl/src/gl/GLWidget.h
new file mode 100644
index 0000000000..df4a73ac50
--- /dev/null
+++ b/libraries/gl/src/gl/GLWidget.h
@@ -0,0 +1,36 @@
+//
+//  Created by Bradley Austin Davis on 2015/12/03
+//  Derived from interface/src/GLCanvas.h created by Stephen Birarda on 8/14/13.
+//  Copyright 2013-2015 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_GLWidget_h
+#define hifi_GLWidget_h
+
+#include <QGLWidget>
+
+/// customized canvas that simply forwards requests/events to the singleton application
+class GLWidget : public QGLWidget {
+    Q_OBJECT
+    
+public:
+    GLWidget();
+    int getDeviceWidth() const;
+    int getDeviceHeight() const;
+    QSize getDeviceSize() const { return QSize(getDeviceWidth(), getDeviceHeight()); }
+
+protected:
+    virtual void initializeGL() override;
+    virtual bool event(QEvent* event) override;
+    virtual void paintEvent(QPaintEvent* event) override;
+    virtual void resizeEvent(QResizeEvent* event) override;
+
+private slots:
+    virtual bool eventFilter(QObject*, QEvent* event) override;
+};
+
+
+#endif // hifi_GLCanvas_h
diff --git a/libraries/gl/src/gl/GlWindow.cpp b/libraries/gl/src/gl/GLWindow.cpp
similarity index 69%
rename from libraries/gl/src/gl/GlWindow.cpp
rename to libraries/gl/src/gl/GLWindow.cpp
index 40a5bedf7e..78c7666d25 100644
--- a/libraries/gl/src/gl/GlWindow.cpp
+++ b/libraries/gl/src/gl/GLWindow.cpp
@@ -6,17 +6,18 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "GlWindow.h"
+#include "GLWindow.h"
 
 #include <QtGui/QOpenGLContext>
 #include <QtGui/QOpenGLDebugLogger>
 
 #include "GLHelpers.h"
 
-GlWindow::GlWindow(QOpenGLContext* shareContext) : GlWindow(getDefaultOpenGlSurfaceFormat(), shareContext) {
+void GLWindow::createContext(QOpenGLContext* shareContext) {
+    createContext(getDefaultOpenGLSurfaceFormat(), shareContext);
 }
 
-GlWindow::GlWindow(const QSurfaceFormat& format, QOpenGLContext* shareContext) {
+void GLWindow::createContext(const QSurfaceFormat& format, QOpenGLContext* shareContext) {
     setSurfaceType(QSurface::OpenGLSurface);
     setFormat(format);
     _context = new QOpenGLContext;
@@ -27,13 +28,15 @@ GlWindow::GlWindow(const QSurfaceFormat& format, QOpenGLContext* shareContext) {
     _context->create();
 }
 
-GlWindow::~GlWindow() {
-    _context->doneCurrent();
-    _context->deleteLater();
-    _context = nullptr;
+GLWindow::~GLWindow() {
+    if (_context) {
+        _context->doneCurrent();
+        _context->deleteLater();
+        _context = nullptr;
+    }
 }
 
-bool GlWindow::makeCurrent() {
+bool GLWindow::makeCurrent() {
     bool makeCurrentResult = _context->makeCurrent(this);
     Q_ASSERT(makeCurrentResult);
     
@@ -49,11 +52,16 @@ bool GlWindow::makeCurrent() {
     return makeCurrentResult;
 }
 
-void GlWindow::doneCurrent() {
+void GLWindow::doneCurrent() {
     _context->doneCurrent();
 }
 
-void GlWindow::swapBuffers() {
+void GLWindow::swapBuffers() {
     _context->swapBuffers(this);
 }
 
+QOpenGLContext* GLWindow::context() const {
+    return _context;
+}
+
+
diff --git a/libraries/gl/src/gl/GlWindow.h b/libraries/gl/src/gl/GLWindow.h
similarity index 63%
rename from libraries/gl/src/gl/GlWindow.h
rename to libraries/gl/src/gl/GLWindow.h
index 4956177725..bccfcd7320 100644
--- a/libraries/gl/src/gl/GlWindow.h
+++ b/libraries/gl/src/gl/GLWindow.h
@@ -7,8 +7,8 @@
 //
 
 #pragma once
-#ifndef hifi_GlWindow_h
-#define hifi_GlWindow_h
+#ifndef hifi_GLWindow_h
+#define hifi_GLWindow_h
 
 #include <mutex>
 #include <QtGui/QWindow>
@@ -16,14 +16,15 @@
 class QOpenGLContext;
 class QOpenGLDebugLogger;
 
-class GlWindow : public QWindow {
+class GLWindow : public QWindow {
 public:
-    GlWindow(QOpenGLContext* shareContext = nullptr);
-    GlWindow(const QSurfaceFormat& format, QOpenGLContext* shareContext = nullptr);
-    virtual ~GlWindow();
+    virtual ~GLWindow();
+    void createContext(QOpenGLContext* shareContext = nullptr);
+    void createContext(const QSurfaceFormat& format, QOpenGLContext* shareContext = nullptr);
     bool makeCurrent();
     void doneCurrent();
     void swapBuffers();
+    QOpenGLContext* context() const;
 private:
     std::once_flag _reportOnce;
     QOpenGLContext* _context{ nullptr };
diff --git a/libraries/gl/src/gl/OffscreenGlCanvas.cpp b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
similarity index 84%
rename from libraries/gl/src/gl/OffscreenGlCanvas.cpp
rename to libraries/gl/src/gl/OffscreenGLCanvas.cpp
index e5c1ee4c4a..640c8ed5f5 100644
--- a/libraries/gl/src/gl/OffscreenGlCanvas.cpp
+++ b/libraries/gl/src/gl/OffscreenGLCanvas.cpp
@@ -1,5 +1,5 @@
 //
-//  OffscreenGlCanvas.cpp
+//  OffscreenGLCanvas.cpp
 //  interface/src/renderer
 //
 //  Created by Bradley Austin Davis on 2014/04/09.
@@ -10,7 +10,7 @@
 //
 
 
-#include "OffscreenGlCanvas.h"
+#include "OffscreenGLCanvas.h"
 
 #include <QtGui/QOffscreenSurface>
 #include <QtGui/QOpenGLDebugLogger>
@@ -18,10 +18,10 @@
 
 #include "GLHelpers.h"
 
-OffscreenGlCanvas::OffscreenGlCanvas() : _context(new QOpenGLContext), _offscreenSurface(new QOffscreenSurface){
+OffscreenGLCanvas::OffscreenGLCanvas() : _context(new QOpenGLContext), _offscreenSurface(new QOffscreenSurface){
 }
 
-OffscreenGlCanvas::~OffscreenGlCanvas() {
+OffscreenGLCanvas::~OffscreenGLCanvas() {
 #ifdef DEBUG
     if (_logger) {
         makeCurrent();
@@ -32,12 +32,12 @@ OffscreenGlCanvas::~OffscreenGlCanvas() {
     _context->doneCurrent();
 }
 
-void OffscreenGlCanvas::create(QOpenGLContext* sharedContext) {
+void OffscreenGLCanvas::create(QOpenGLContext* sharedContext) {
     if (nullptr != sharedContext) {
         sharedContext->doneCurrent();
         _context->setShareContext(sharedContext);
     }
-    _context->setFormat(getDefaultOpenGlSurfaceFormat());
+    _context->setFormat(getDefaultOpenGLSurfaceFormat());
     _context->create();
 
     _offscreenSurface->setFormat(_context->format());
@@ -45,7 +45,7 @@ void OffscreenGlCanvas::create(QOpenGLContext* sharedContext) {
 
 }
 
-bool OffscreenGlCanvas::makeCurrent() {
+bool OffscreenGLCanvas::makeCurrent() {
     bool result = _context->makeCurrent(_offscreenSurface);
     Q_ASSERT(result);
     
@@ -72,7 +72,7 @@ bool OffscreenGlCanvas::makeCurrent() {
     return result;
 }
 
-void OffscreenGlCanvas::doneCurrent() {
+void OffscreenGLCanvas::doneCurrent() {
     _context->doneCurrent();
 }
 
diff --git a/libraries/gl/src/gl/OffscreenGlCanvas.h b/libraries/gl/src/gl/OffscreenGLCanvas.h
similarity index 77%
rename from libraries/gl/src/gl/OffscreenGlCanvas.h
rename to libraries/gl/src/gl/OffscreenGLCanvas.h
index 94014adf98..e278f550f0 100644
--- a/libraries/gl/src/gl/OffscreenGlCanvas.h
+++ b/libraries/gl/src/gl/OffscreenGLCanvas.h
@@ -1,5 +1,5 @@
 //
-//  OffscreenGlCanvas.h
+//  OffscreenGLCanvas.h
 //  interface/src/renderer
 //
 //  Created by Bradley Austin Davis on 2014/04/09.
@@ -9,8 +9,8 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 #pragma once
-#ifndef hifi_OffscreenGlCanvas_h
-#define hifi_OffscreenGlCanvas_h
+#ifndef hifi_OffscreenGLCanvas_h
+#define hifi_OffscreenGLCanvas_h
 
 #include <mutex>
 #include <QObject>
@@ -19,10 +19,10 @@ class QOpenGLContext;
 class QOffscreenSurface;
 class QOpenGLDebugLogger;
 
-class OffscreenGlCanvas : public QObject {
+class OffscreenGLCanvas : public QObject {
 public:
-    OffscreenGlCanvas();
-    ~OffscreenGlCanvas();
+    OffscreenGLCanvas();
+    ~OffscreenGLCanvas();
     void create(QOpenGLContext* sharedContext = nullptr);
     bool makeCurrent();
     void doneCurrent();
@@ -40,4 +40,4 @@ protected:
 
 };
 
-#endif // hifi_OffscreenGlCanvas_h
+#endif // hifi_OffscreenGLCanvas_h
diff --git a/libraries/gl/src/gl/OffscreenQmlSurface.cpp b/libraries/gl/src/gl/OffscreenQmlSurface.cpp
index e8a950a16b..f2eb112dc7 100644
--- a/libraries/gl/src/gl/OffscreenQmlSurface.cpp
+++ b/libraries/gl/src/gl/OffscreenQmlSurface.cpp
@@ -23,7 +23,7 @@
 #include <NumericalConstants.h>
 
 #include "GLEscrow.h"
-#include "OffscreenGlCanvas.h"
+#include "OffscreenGLCanvas.h"
 
 // FIXME move to threaded rendering with Qt 5.5
 //#define QML_THREADED
@@ -64,12 +64,12 @@ static const QEvent::Type STOP = QEvent::Type(QEvent::User + 4);
 static const QEvent::Type UPDATE = QEvent::Type(QEvent::User + 5);
 #endif
 
-class OffscreenQmlRenderer : public OffscreenGlCanvas {
+class OffscreenQmlRenderer : public OffscreenGLCanvas {
     friend class OffscreenQmlSurface;
 public:
 
     OffscreenQmlRenderer(OffscreenQmlSurface* surface, QOpenGLContext* shareContext) : _surface(surface) {
-        OffscreenGlCanvas::create(shareContext);
+        OffscreenGLCanvas::create(shareContext);
 #ifdef QML_THREADED
         // Qt 5.5
         _renderControl->prepareThread(_renderThread);
diff --git a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
index ddf251778f..f0398158b4 100644
--- a/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
+++ b/plugins/oculusLegacy/src/OculusLegacyDisplayPlugin.cpp
@@ -12,7 +12,6 @@
 #include <QtWidgets/QMainWindow>
 #include <QtOpenGL/QGLWidget>
 #include <GLMHelpers.h>
-#include <gl/GlWindow.h>
 #include <QEvent>
 #include <QtGui/QResizeEvent>
 #include <QtGui/QOpenGLContext>
diff --git a/tests/shaders/src/main.cpp b/tests/shaders/src/main.cpp
index 3edff67d66..f65cd9b5aa 100644
--- a/tests/shaders/src/main.cpp
+++ b/tests/shaders/src/main.cpp
@@ -128,7 +128,7 @@ protected:
 public:
     QTestWindow() {
         setSurfaceType(QSurface::OpenGLSurface);
-        QSurfaceFormat format = getDefaultOpenGlSurfaceFormat();
+        QSurfaceFormat format = getDefaultOpenGLSurfaceFormat();
         setFormat(format);
         _context = new QOpenGLContext;
         _context->setFormat(format);