diff --git a/WearScript/src/main/AndroidManifest.xml b/WearScript/src/main/AndroidManifest.xml
index a23d77ad..a93ba876 100644
--- a/WearScript/src/main/AndroidManifest.xml
+++ b/WearScript/src/main/AndroidManifest.xml
@@ -51,7 +51,7 @@
         android:allowBackup="true"
         android:icon="@drawable/launcher"
         android:label="@string/app_name">
-        <activity android:name=".ui.WSActivity"
+        <activity android:name=".ui.MediaActivity"
             ></activity>
         <activity
             android:name=".ui.ScriptActivity"
diff --git a/WearScript/src/main/assets/init.js b/WearScript/src/main/assets/init.js
index 9c5e9ee8..abd08c86 100644
--- a/WearScript/src/main/assets/init.js
+++ b/WearScript/src/main/assets/init.js
@@ -678,16 +678,22 @@ function WearScript() {
     this.callbacks = {};
     this.cbCount = 0;
     this.picarusModelCount = 0;
-    this.PicarusModel = function (model, callback) {
-        this.id = WS.picarusModelCount;
-        WS.picarusModelCount += 1;
-        callback = WS._funcfix(callback);
-        this.loaded = false;
-        WSRAW.picarusModelCreate(model, this.id, WS._funcwrap((function () {
-            this.loaded = true;
-            callback();
-        }).bind(this)));
-
+    this.Media = function (url, loop) {
+        if (!loop)
+            loop = false;
+        WSRAW.mediaLoad(url, loop);
+        this.play = function () {
+            WSRAW.mediaPlay();
+        }.bind(this);
+        this.pause = function () {
+            WSRAW.mediaPause();
+        }.bind(this);
+        this.stop = function () {
+            WSRAW.mediaStop();
+        }.bind(this);
+    }
+    this.PicarusModel = function (id) {
+        this.id = id;
         this.process = function (input, callback) {
             callback = WS._funcfix(callback);
             WSRAW.picarusModelProcess(this.id, input, WS._funcwrap(function (x) {callback(atob(x))}));
@@ -701,6 +707,57 @@ function WearScript() {
             WSRAW.picarusModelProcessWarp(this.id, WS._funcwrap(function (x) {callback(atob(x))}));
         };
     };
+    this.picarusModelFactory = function(modelb64, callback) {
+        var id = WS.picarusModelCount;
+        WS.picarusModelCount += 1;
+        var model = new WS.PicarusModel(id);
+        callback = WS._funcfix(callback);
+        WSRAW.picarusModelCreate(modelb64, id, WS._funcwrap((function () {
+            callback(model);
+        }).bind(this)));
+    };
+    this.PicarusARTag = function (model) {
+        this.model = model;
+        this._parseData = function (x) {
+            var out = [];
+            if (!x)
+                return out;
+            x = msgpack.unpack(x);
+            if (!x)
+                return out;
+            for (var i = 0; i < x[0].length / 9; i+= 9) {
+                var points = [];
+                var dataCur = x[0].slice(i * 9);
+                points.push([dataCur[1], dataCur[2]]);
+                points.push([dataCur[3], dataCur[4]]);
+                points.push([dataCur[5], dataCur[6]]);
+                points.push([dataCur[7], dataCur[8]]);
+                out.push({id: dataCur[0], xy: points});
+            }
+            return out;
+        }
+        this.process = function (input, callback) {
+            this.model.process(input, (function (data) {
+                callback(this._parseData(data));
+            }).bind(this));
+        }
+        this.processStream = function (callback) {
+            this.model.processStream((function (data) {
+                callback(this._parseData(data));
+            }).bind(this));
+        }
+        this.processWarpTargets = function (callback) {
+            this.model.processWarpTargets((function (data) {
+                callback(this._parseData(data));
+            }).bind(this));
+        }
+    }
+    this.picarusARTagFactory = function (callback) {
+        var model_ar = btoa(msgpack.pack([{'kw': {}, 'name': 'picarus.ARMarkerDetector'}]).map(function (x) {return String.fromCharCode(x)}).join(''));
+        WS.picarusModelFactory(model_ar, (function (model) {
+           callback(new WS.PicarusARTag(model));
+        }).bind(this));
+    }
     this.Cards = function (cards) {
          this.cards = cards || [];
          this.isFunc = function (x) {return typeof x === 'function'};
@@ -744,9 +801,6 @@ function WearScript() {
               return this;
          }
     }
-    this.createMedia = function (url, looping) {
-        WSRAW.mediaLoad(url, looping);
-    }
     this.scriptVersion = function (num) {
         WSRAW.scriptVersion(num);
     }
@@ -973,6 +1027,21 @@ function WearScript() {
     this.bluetoothWrite = function (address, data) {
         WSRAW.bluetoothWrite(address, btoa(data));
     }
+    this.bluetoothEnable = function () {
+        WSRAW.bluetoothEnable();
+    }
+    this.bluetoothDisable = function () {
+        WSRAW.bluetoothDisable();
+    }
+    this.bluetoothBond = function (address, pin) {
+        WSRAW.bluetoothBond(address, pin);
+    }
+    this.bluetoothDiscover = function (callback) {
+        callback = this._funcfix(callback);
+        WSRAW.bluetoothDiscover(this._funcwrap(function (x) {callback(JSON.parse(x))}));
+    }
+
+
     this.pebbleSetTitle = function(text, clear) {
         WSRAW.pebbleSetTitle(text, clear);
     }
diff --git a/WearScript/src/main/assets/init.js.min b/WearScript/src/main/assets/init.js.min
index 2df2dd20..17a3d22a 100644
--- a/WearScript/src/main/assets/init.js.min
+++ b/WearScript/src/main/assets/init.js.min
@@ -1,28 +1,30 @@
-this.msgpack||function(a){function e(a,c){q=0;var e=h([],a,0);return q?!1:c?m(e):e}function b(a){w="string"===typeof a?x(a):a;f=-1;return l()}function h(a,c,e){var d,b,f;if(null==c)a.push(192);else if(!1===c)a.push(194);else if(!0===c)a.push(195);else switch(typeof c){case "number":c!==c?a.push(203,255,255,255,255,255,255,255,255):Infinity===c?a.push(203,127,240,0,0,0,0,0,0):Math.floor(c)===c?0>c?-32<=c?a.push(224+c+32):-128<c?a.push(208,c+256):-32768<c?(c+=65536,a.push(209,c>>8,c&255)):-2147483648<
-c?(c+=4294967296,a.push(210,c>>>24,c>>16&255,c>>8&255,c&255)):(b=Math.floor(c/4294967296),c&=4294967295,a.push(211,b>>24&255,b>>16&255,b>>8&255,b&255,c>>24&255,c>>16&255,c>>8&255,c&255)):128>c?a.push(c):256>c?a.push(204,c):65536>c?a.push(205,c>>8,c&255):4294967296>c?a.push(206,c>>>24,c>>16&255,c>>8&255,c&255):(b=Math.floor(c/4294967296),c&=4294967295,a.push(207,b>>24&255,b>>16&255,b>>8&255,b&255,c>>24&255,c>>16&255,c>>8&255,c&255)):((b=0>c)&&(c*=-1),f=Math.log(c)/0.6931471805599453+1023|0,e=c*Math.pow(2,
-1075-f),c=e&4294967295,b&&(f|=2048),b=e/4294967296&1048575|f<<20,a.push(203,b>>24&255,b>>16&255,b>>8&255,b&255,c>>24&255,c>>16&255,c>>8&255,c&255));break;case "string":e=c.length;f=a.length;a.push(0);for(b=0;b<e;++b)d=c.charCodeAt(b),128>d?a.push(d&127):2048>d?a.push(d>>>6&31|192,d&63|128):65536>d&&a.push(d>>>12&15|224,d>>>6&63|128,d&63|128);d=a.length-f-1;32>d?a[f]=160+d:65536>d?a.splice(f,1,218,d>>8,d&255):4294967296>d&&a.splice(f,1,219,d>>>24,d>>16&255,d>>8&255,d&255);break;default:if(++e>=C)return q=
-1,[];if(D(c))for(d=c.length,16>d?a.push(144+d):65536>d?a.push(220,d>>8,d&255):4294967296>d&&a.push(221,d>>>24,d>>16&255,d>>8&255,d&255),b=0;b<d;++b)h(a,c[b],e);else{f=a.length;a.push(0);d=0;for(b in c)++d,h(a,b,e),h(a,c[b],e);16>d?a[f]=128+d:65536>d?a.splice(f,1,222,d>>8,d&255):4294967296>d&&a.splice(f,1,223,d>>>24,d>>16&255,d>>8&255,d&255)}}return a}function l(){var a,c,e,d=0,b,h,g=w;c=g[++f];if(224<=c)return c-256;if(192>c){if(128>c)return c;144>c?(d=c-128,c=128):160>c?(d=c-144,c=144):(d=c-160,
-c=160)}switch(c){case 192:return null;case 194:return!1;case 195:return!0;case 202:return d=16777216*g[++f]+(g[++f]<<16)+(g[++f]<<8)+g[++f],b=d>>23&255,h=d&8388607,d&&2147483648!==d?255===b?h?NaN:Infinity:(d&2147483648?-1:1)*(h|8388608)*Math.pow(2,b-127-23):0;case 203:d=16777216*g[++f]+(g[++f]<<16)+(g[++f]<<8)+g[++f];c=d&2147483648;b=d>>20&2047;h=d&1048575;if(!d||2147483648===d)return f+=4,0;if(2047===b)return f+=4,h?NaN:Infinity;d=16777216*g[++f]+(g[++f]<<16)+(g[++f]<<8)+g[++f];return(c?-1:1)*((h|
+this.msgpack||function(a){function c(a,e){r=0;var c=h([],a,0);return r?!1:e?m(c):c}function b(a){v="string"===typeof a?w(a):a;f=-1;return k()}function h(a,e,c){var d,b,f;if(null==e)a.push(192);else if(!1===e)a.push(194);else if(!0===e)a.push(195);else switch(typeof e){case "number":e!==e?a.push(203,255,255,255,255,255,255,255,255):Infinity===e?a.push(203,127,240,0,0,0,0,0,0):Math.floor(e)===e?0>e?-32<=e?a.push(224+e+32):-128<e?a.push(208,e+256):-32768<e?(e+=65536,a.push(209,e>>8,e&255)):-2147483648<
+e?(e+=4294967296,a.push(210,e>>>24,e>>16&255,e>>8&255,e&255)):(b=Math.floor(e/4294967296),e&=4294967295,a.push(211,b>>24&255,b>>16&255,b>>8&255,b&255,e>>24&255,e>>16&255,e>>8&255,e&255)):128>e?a.push(e):256>e?a.push(204,e):65536>e?a.push(205,e>>8,e&255):4294967296>e?a.push(206,e>>>24,e>>16&255,e>>8&255,e&255):(b=Math.floor(e/4294967296),e&=4294967295,a.push(207,b>>24&255,b>>16&255,b>>8&255,b&255,e>>24&255,e>>16&255,e>>8&255,e&255)):((b=0>e)&&(e*=-1),f=Math.log(e)/0.6931471805599453+1023|0,c=e*Math.pow(2,
+1075-f),e=c&4294967295,b&&(f|=2048),b=c/4294967296&1048575|f<<20,a.push(203,b>>24&255,b>>16&255,b>>8&255,b&255,e>>24&255,e>>16&255,e>>8&255,e&255));break;case "string":c=e.length;f=a.length;a.push(0);for(b=0;b<c;++b)d=e.charCodeAt(b),128>d?a.push(d&127):2048>d?a.push(d>>>6&31|192,d&63|128):65536>d&&a.push(d>>>12&15|224,d>>>6&63|128,d&63|128);d=a.length-f-1;32>d?a[f]=160+d:65536>d?a.splice(f,1,218,d>>8,d&255):4294967296>d&&a.splice(f,1,219,d>>>24,d>>16&255,d>>8&255,d&255);break;default:if(++c>=B)return r=
+1,[];if(C(e))for(d=e.length,16>d?a.push(144+d):65536>d?a.push(220,d>>8,d&255):4294967296>d&&a.push(221,d>>>24,d>>16&255,d>>8&255,d&255),b=0;b<d;++b)h(a,e[b],c);else{f=a.length;a.push(0);d=0;for(b in e)++d,h(a,b,c),h(a,e[b],c);16>d?a[f]=128+d:65536>d?a.splice(f,1,222,d>>8,d&255):4294967296>d&&a.splice(f,1,223,d>>>24,d>>16&255,d>>8&255,d&255)}}return a}function k(){var a,e,c,d=0,b,h,g=v;e=g[++f];if(224<=e)return e-256;if(192>e){if(128>e)return e;144>e?(d=e-128,e=128):160>e?(d=e-144,e=144):(d=e-160,
+e=160)}switch(e){case 192:return null;case 194:return!1;case 195:return!0;case 202:return d=16777216*g[++f]+(g[++f]<<16)+(g[++f]<<8)+g[++f],b=d>>23&255,h=d&8388607,d&&2147483648!==d?255===b?h?NaN:Infinity:(d&2147483648?-1:1)*(h|8388608)*Math.pow(2,b-127-23):0;case 203:d=16777216*g[++f]+(g[++f]<<16)+(g[++f]<<8)+g[++f];e=d&2147483648;b=d>>20&2047;h=d&1048575;if(!d||2147483648===d)return f+=4,0;if(2047===b)return f+=4,h?NaN:Infinity;d=16777216*g[++f]+(g[++f]<<16)+(g[++f]<<8)+g[++f];return(e?-1:1)*((h|
 1048576)*Math.pow(2,b-1023-20)+d*Math.pow(2,b-1023-52));case 207:return d=16777216*g[++f]+(g[++f]<<16)+(g[++f]<<8)+g[++f],4294967296*d+16777216*g[++f]+(g[++f]<<16)+(g[++f]<<8)+g[++f];case 206:d+=16777216*g[++f]+(g[++f]<<16);case 205:d+=g[++f]<<8;case 204:return d+g[++f];case 211:return d=g[++f],d&128?-1*(72057594037927936*(d^255)+281474976710656*(g[++f]^255)+1099511627776*(g[++f]^255)+4294967296*(g[++f]^255)+16777216*(g[++f]^255)+65536*(g[++f]^255)+256*(g[++f]^255)+(g[++f]^255)+1):72057594037927936*
-d+281474976710656*g[++f]+1099511627776*g[++f]+4294967296*g[++f]+16777216*g[++f]+65536*g[++f]+256*g[++f]+g[++f];case 210:return d=16777216*g[++f]+(g[++f]<<16)+(g[++f]<<8)+g[++f],2147483648>d?d:d-4294967296;case 209:return d=(g[++f]<<8)+g[++f],32768>d?d:d-65536;case 208:return d=g[++f],128>d?d:d-256;case 219:d+=16777216*g[++f]+(g[++f]<<16);case 218:d+=(g[++f]<<8)+g[++f];case 160:b=[];c=f;for(a=c+d;c<a;)e=g[++c],b.push(e);f=c;return 10240>b.length?n.apply(null,b):m(b);case 223:d+=16777216*g[++f]+(g[++f]<<
-16);case 222:d+=(g[++f]<<8)+g[++f];case 128:for(h={};d--;){a=g[++f]-160;b=[];c=f;for(a=c+a;c<a;)e=g[++c],b.push(128>e?e:224>e?(e&31)<<6|g[++c]&63:(e&15)<<12|(g[++c]&63)<<6|g[++c]&63);f=c;h[n.apply(null,b)]=l()}return h;case 221:d+=16777216*g[++f]+(g[++f]<<16);case 220:d+=(g[++f]<<8)+g[++f];case 144:for(b=[];d--;)b.push(l());return b}}function m(a){try{return n.apply(this,a)}catch(c){}for(var b=[],d=0,e=a.length,f=r;d<e;++d)b[d]=f[a[d]];return b.join("")}function u(e,c,f){function d(){if(4===k.readyState){var d,
-e=k.status,g={status:e,ok:200<=e&&300>e};if(!n++){if("PUT"===l)d=g.ok?k.responseText:"";else if(g.ok){if(c.worker&&a.Worker){d=new Worker(msgpack.worker);d.onmessage=function(a){f(a.data,c,g)};d.postMessage({method:"unpack",data:k.responseText});t();return}d=y?E(k):x(k.responseText);d=b(d)}s&&s(k,c,g);f(d,c,g);t()}}}function h(a,d){if(!n++){var e={status:d||400,ok:!1};s&&s(k,c,e);f(null,c,e);t(a)}}function t(c){c&&k&&k.abort&&k.abort();g&&(clearTimeout(g),g=0);k=null;a.addEventListener&&a.removeEventListener("beforeunload",
-h,!1)}var g=0,l=c.method||"GET",z=c.header||{},A=c.before,s=c.after,p=c.data||null,k=a.XMLHttpRequest?new XMLHttpRequest:a.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null,n=0,m,q="GET"===l&&c.binary;try{k.onreadystatechange=d;k.open(l,e,!0);A&&A(k,c);q&&k.overrideMimeType&&k.overrideMimeType("text/plain; charset=x-user-defined");p&&k.setRequestHeader("Content-Type","application/x-www-form-urlencoded");for(m in z)k.setRequestHeader(m,z[m]);a.addEventListener&&a.addEventListener("beforeunload",
-h,!1);k.send(p);g=setTimeout(function(){h(1,408)},1E3*(c.timeout||10))}catch(r){h(0,400)}}function x(a){var c=[],e=v,d=a.split(""),b=-1,f;f=d.length;for(a=f%8;a--;)++b,c[b]=e[d[b]];for(a=f>>3;a--;)c.push(e[d[++b]],e[d[++b]],e[d[++b]],e[d[++b]],e[d[++b]],e[d[++b]],e[d[++b]],e[d[++b]]);return c}function E(a){var c=[],e,d,b,f,g,h,l,m,n,p=-1,k;k=vblen(a);a=vbstr(a);d=Math.ceil(k/2);for(e=d%8;e--;)b=a.charCodeAt(++p),c.push(b&255,b>>8);for(e=d>>3;e--;)b=a.charCodeAt(++p),d=a.charCodeAt(++p),f=a.charCodeAt(++p),
-g=a.charCodeAt(++p),h=a.charCodeAt(++p),l=a.charCodeAt(++p),m=a.charCodeAt(++p),n=a.charCodeAt(++p),c.push(b&255,b>>8,d&255,d>>8,f&255,f>>8,g&255,g>>8,h&255,h>>8,l&255,l>>8,m&255,m>>8,n&255,n>>8);k%2&&c.pop();return c}function B(e){var c=[],b=0,d=-1,f=e.length,h=[0,2,1][e.length%3],b=r,g=F;if(a.btoa){for(;d<f;)c.push(b[e[++d]]);return btoa(c.join(""))}for(--f;d<f;)b=e[++d]<<16|e[++d]<<8|e[++d],c.push(g[b>>18&63],g[b>>12&63],g[b>>6&63],g[b&63]);1<h&&(c[c.length-2]="=");0<h&&(c[c.length-1]="=");return c.join("")}
-a.msgpack={pack:e,unpack:b,worker:"msgpack.js",upload:function(b,c,f){c.method="PUT";c.binary=!0;if(c.worker&&a.Worker){var d=new Worker(msgpack.worker);d.onmessage=function(a){c.data=a.data;u(b,c,f)};d.postMessage({method:"pack",data:c.data})}else c.data=B(e(c.data)),u(b,c,f)},download:function(a,b,e){b.method="GET";b.binary=!0;u(a,b,e)}};var y=/MSIE/.test(navigator.userAgent),v={},r={},F="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split(""),w=[],f=0,q=0,D=Array.isArray||function(a){return"[object Array]"===
-Object.prototype.toString.call(a)},n=String.fromCharCode,C=512;self.importScripts&&(onmessage=function(a){"pack"===a.data.method?postMessage(B(e(a.data.data))):postMessage(b(a.data.data))});(function(){for(var a=0,b;256>a;++a)b=n(a),v[b]=a,r[a]=b;for(a=128;256>a;++a)v[n(63232+a)]=a})();y&&document.write('<script type="text/vbscript">Function vblen(b)vblen=LenB(b.responseBody)End Function\nFunction vbstr(b)vbstr=CStr(b.responseBody)+chr(0)End Function\x3c/script>')}(this);
-function WearScript(){this._randstr=function(a){for(var e="",b=0;b<a;b++)e+="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".charAt(Math.floor(52*Math.random()));return e};this._cbPrefix="WS"+this._randstr(4);this.callbacks={};this.picarusModelCount=this.cbCount=0;this.PicarusModel=function(a,e){this.id=WS.picarusModelCount;WS.picarusModelCount+=1;e=WS._funcfix(e);this.loaded=!1;WSRAW.picarusModelCreate(a,this.id,WS._funcwrap(function(){this.loaded=!0;e()}.bind(this)));this.process=function(a,
-e){e=WS._funcfix(e);WSRAW.picarusModelProcess(this.id,a,WS._funcwrap(function(a){e(atob(a))}))};this.processStream=function(a){a=WS._funcfix(a);WSRAW.picarusModelProcessStream(this.id,WS._funcwrap(function(e){a(atob(e))}))};this.processWarpTargets=function(a){a=WS._funcfix(a);WSRAW.picarusModelProcessWarp(this.id,WS._funcwrap(function(e){a(atob(e))}))}};this.Cards=function(a){this.cards=a||[];this.isFunc=function(a){return"function"===typeof a};this.isObj=function(a){return"object"===typeof a};this.isUndef=
-function(a){return"undefined"===typeof a};this.isStr=function(a){return"string"===typeof a};this.addHTML=function(){var a={card:{type:"html",html:document.getElementById(arguments[0]).innerHTML}},b=Array.prototype.slice.call(arguments).slice(1);return this._add(a,b)};this.add=function(){var a={card:{type:"card",text:arguments[0],info:arguments[1]}},b=Array.prototype.slice.call(arguments).slice(2);return this._add(a,b)};this._add=function(a,b){if(0<b.length&&this.isFunc(b[0])||this.isUndef(b[0]))this.isFunc(b[0])&&
-(a.selected=WS._funcwrap(b[0])),b=b.slice(1);if(0<b.length&&this.isFunc(b[0])||this.isUndef(b[0]))this.isFunc(b[0])&&(a.click=WS._funcwrap(b[0])),b=b.slice(1);if(0<b.length&&this.isObj(b[0]))a.children=b[0].cards,b.slice(1);else if(0<b.length&&0==b.length%2){a.menu=[];for(var h=0;h<b.length&&this.isStr(b[h])&&(this.isFunc(b[h+1])||this.isUndef(b[h+1]));h+=2)a.menu.push({label:b[h],callback:WS._funcwrap(b[h+1])})}this.cards.push(a);return this}};this.createMedia=function(a,e){WSRAW.mediaLoad(a,e)};
-this.scriptVersion=function(a){WSRAW.scriptVersion(a)};this.shutdown=function(){WSRAW.shutdown()};this.sensor=function(a){return WSRAW.sensor(a)};this.sensors=function(){return JSON.parse(WSRAW.sensors())};this._funcwrap=function(a){var e={};return a&&"[object Function]"===e.toString.call(a)?(e=this._cbPrefix+this.cbCount,this.cbCount+=1,window[e]=a,e):a};this._funcfix=function(a){return"string"===typeof a?(this.log("Warning: deprecated use of string as a function: "+a),window[a]):a};this.publish=
-function(){var a=msgpack.pack(Array.prototype.slice.call(arguments));WSRAW.publish(arguments[0],btoa(a.map(function(a){return String.fromCharCode(a)}).join("")))};this.subscribe=function(a,e){e=this._funcfix(e);WSRAW.subscribe(a,this._funcwrap(function(a){return e.apply(null,msgpack.unpack(atob(a)))}))};this.sensorOn=function(a,e,b){"string"===typeof a&&(a=this.sensor(a));b?WSRAW.sensorOn(a,e,this._funcwrap(b)):WSRAW.sensorOn(a,e)};this.sensorOff=function(a){"string"===typeof a&&(a=this.sensor(a));
-WSRAW.sensorOff(a)};this.dataLog=function(a,e,b){WSRAW.dataLog(a,e,b)};this.say=function(a){WSRAW.say(a)};this.qr=function(a){a=this._funcfix(a);WSRAW.qr(this._funcwrap(function(e,b){a(atob(e),b)}))};this.log=function(a){WSRAW.log(a)};this.displayWebView=function(){WSRAW.displayWebView()};this.displayWarpView=function(a){a?WSRAW.displayWarpView(JSON.stringify(a)):WSRAW.displayWarpView()};this.warpDraw=function(a,e,b,h,l,m){WSRAW.warpDraw(a,e,b,h,l,m)};this.warpGlassToPreviewH=function(a){a=this._funcfix(a);
-WSRAW.warpGlassToPreviewH(this._funcwrap(function(e){a(JSON.parse(e))}))};this.warpSetOverlay=function(a){WSRAW.warpSetOverlay(a)};this.cvInit=function(a){a=this._funcfix(a);WSRAW.cvInit(this._funcwrap(a))};this.warpPreviewSampleGlass=function(a){a=a?this._funcwrap(this._funcfix(a)):"";WSRAW.warpPreviewSampleGlass(a)};this.displayCardTree=function(){WSRAW.displayCardTree()};this.cardTree=function(a){WSRAW.cardTree(JSON.stringify(a.cards))};this.cameraOn=function(a,e,b,h){e||(e=0);b||(maxwidth=0);
-h?(h=this._funcfix(h),WSRAW.cameraOn(a,e,b,!1,this._funcwrap(h))):WSRAW.cameraOn(a,e,b,!1)};this.cameraOnBackgroundUnsafe=function(a,e,b,h){e||(e=0);b||(maxwidth=0);h?(h=this._funcfix(h),WSRAW.cameraOn(a,e,b,!0,this._funcwrap(h))):WSRAW.cameraOn(a,e,b,!0)};this.cameraPhoto=function(a){a?(a=this._funcfix(a),WSRAW.cameraPhoto(this._funcwrap(a))):WSRAW.cameraPhoto()};this.cameraPhotoData=function(a){a?(a=this._funcfix(a),WSRAW.cameraPhotoData(this._funcwrap(a))):WSRAW.cameraPhoto()};this.cameraVideo=
-function(a){a?(a=this._funcfix(a),WSRAW.cameraVideo(this._funcwrap(a))):WSRAW.cameraVideo()};this.cameraOff=function(){WSRAW.cameraOff()};this.activityCreate=function(){WSRAW.activityCreate()};this.activityDestroy=function(){WSRAW.activityDestroy()};this.wifiOn=function(a){a=this._funcfix(a);WSRAW.wifiOn(this._funcwrap(a))};this.wifiOff=function(){WSRAW.wifiOff()};this.wifiScan=function(){WSRAW.wifiScan()};this.serverConnect=function(a,e){e=this._funcfix(e);WSRAW.serverConnect(a,this._funcwrap(e))};
-this.wake=function(){WSRAW.wake()};this.sound=function(a){WSRAW.sound(a)};this.gestureCallback=function(a,e){e=this._funcfix(e);WSRAW.gestureCallback(a,this._funcwrap(e))};this.speechRecognize=function(a,e){e=this._funcfix(e);WSRAW.speechRecognize(a,this._funcwrap(function(a){e(atob(a))}))};this.liveCardCreate=function(a,e){var b=[],h=Array.prototype.slice.call(arguments).slice(2);0==h.length&&(h.push("Open"),h.push(function(){WS.activityCreate()}),h.push("Shutdown"),h.push(function(){WS.shutdown()}));
-for(var l=0;l<h.length;l+=2)b.push({label:h[l],callback:this._funcwrap(this._funcfix(h[l+1]))});WSRAW.liveCardCreate(a,e,JSON.stringify(b))};this.liveCardDestroy=function(){WSRAW.liveCardDestroy()};this.device=function(){return WSRAW.device()};this.groupDevice=function(){return WSRAW.groupDevice()};this.group=function(){return WSRAW.group()};this.bluetoothList=function(a){a=this._funcfix(a);WSRAW.bluetoothList(this._funcwrap(function(e){a(JSON.parse(e))}))};this.bluetoothRead=function(a,e){e=this._funcfix(e);
-WSRAW.bluetoothRead(a,this._funcwrap(function(a){e(atob(a))}))};this.bluetoothWrite=function(a,e){WSRAW.bluetoothWrite(a,btoa(e))};this.pebbleSetTitle=function(a,e){WSRAW.pebbleSetTitle(a,e)};this.pebbleSetSubtitle=function(a,e){WSRAW.pebbleSetSubtitle(a,e)};this.pebbleSetBody=function(a,e){WSRAW.pebbleSetBody(a,e)};this.pebbleVibe=function(a){WSRAW.pebbleVibe(a)};this.control=function(a,e){e||(e=!1);WSRAW.control(a,e)};this.picarus=function(a,e,b){b=this._funcfix(b);WSRAW.picarus(a,e,this._funcwrap(function(a){b(atob(a))}))};
-this.picarusStream=function(a,e){e=this._funcfix(e);WSRAW.picarusStream(a,this._funcwrap(function(a){e(atob(a))}))}}WS=new WearScript;
\ No newline at end of file
+d+281474976710656*g[++f]+1099511627776*g[++f]+4294967296*g[++f]+16777216*g[++f]+65536*g[++f]+256*g[++f]+g[++f];case 210:return d=16777216*g[++f]+(g[++f]<<16)+(g[++f]<<8)+g[++f],2147483648>d?d:d-4294967296;case 209:return d=(g[++f]<<8)+g[++f],32768>d?d:d-65536;case 208:return d=g[++f],128>d?d:d-256;case 219:d+=16777216*g[++f]+(g[++f]<<16);case 218:d+=(g[++f]<<8)+g[++f];case 160:b=[];e=f;for(a=e+d;e<a;)c=g[++e],b.push(c);f=e;return 10240>b.length?n.apply(null,b):m(b);case 223:d+=16777216*g[++f]+(g[++f]<<
+16);case 222:d+=(g[++f]<<8)+g[++f];case 128:for(h={};d--;){a=g[++f]-160;b=[];e=f;for(a=e+a;e<a;)c=g[++e],b.push(128>c?c:224>c?(c&31)<<6|g[++e]&63:(c&15)<<12|(g[++e]&63)<<6|g[++e]&63);f=e;h[n.apply(null,b)]=k()}return h;case 221:d+=16777216*g[++f]+(g[++f]<<16);case 220:d+=(g[++f]<<8)+g[++f];case 144:for(b=[];d--;)b.push(k());return b}}function m(a){try{return n.apply(this,a)}catch(c){}for(var b=[],d=0,f=a.length,h=s;d<f;++d)b[d]=h[a[d]];return b.join("")}function t(c,e,f){function d(){if(4===l.readyState){var c,
+d=l.status,g={status:d,ok:200<=d&&300>d};if(!n++){if("PUT"===m)c=g.ok?l.responseText:"";else if(g.ok){if(e.worker&&a.Worker){c=new Worker(msgpack.worker);c.onmessage=function(a){f(a.data,e,g)};c.postMessage({method:"unpack",data:l.responseText});k();return}c=x?D(l):w(l.responseText);c=b(c)}q&&q(l,e,g);f(c,e,g);k()}}}function h(a,c){if(!n++){var b={status:c||400,ok:!1};q&&q(l,e,b);f(null,e,b);k(a)}}function k(c){c&&l&&l.abort&&l.abort();g&&(clearTimeout(g),g=0);l=null;a.addEventListener&&a.removeEventListener("beforeunload",
+h,!1)}var g=0,m=e.method||"GET",y=e.header||{},z=e.before,q=e.after,p=e.data||null,l=a.XMLHttpRequest?new XMLHttpRequest:a.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null,n=0,r,s="GET"===m&&e.binary;try{l.onreadystatechange=d;l.open(m,c,!0);z&&z(l,e);s&&l.overrideMimeType&&l.overrideMimeType("text/plain; charset=x-user-defined");p&&l.setRequestHeader("Content-Type","application/x-www-form-urlencoded");for(r in y)l.setRequestHeader(r,y[r]);a.addEventListener&&a.addEventListener("beforeunload",
+h,!1);l.send(p);g=setTimeout(function(){h(1,408)},1E3*(e.timeout||10))}catch(t){h(0,400)}}function w(a){var c=[],b=u,d=a.split(""),f=-1,h;h=d.length;for(a=h%8;a--;)++f,c[f]=b[d[f]];for(a=h>>3;a--;)c.push(b[d[++f]],b[d[++f]],b[d[++f]],b[d[++f]],b[d[++f]],b[d[++f]],b[d[++f]],b[d[++f]]);return c}function D(a){var c=[],b,d,f,h,g,k,m,n,q,p=-1,l;l=vblen(a);a=vbstr(a);d=Math.ceil(l/2);for(b=d%8;b--;)f=a.charCodeAt(++p),c.push(f&255,f>>8);for(b=d>>3;b--;)f=a.charCodeAt(++p),d=a.charCodeAt(++p),h=a.charCodeAt(++p),
+g=a.charCodeAt(++p),k=a.charCodeAt(++p),m=a.charCodeAt(++p),n=a.charCodeAt(++p),q=a.charCodeAt(++p),c.push(f&255,f>>8,d&255,d>>8,h&255,h>>8,g&255,g>>8,k&255,k>>8,m&255,m>>8,n&255,n>>8,q&255,q>>8);l%2&&c.pop();return c}function A(c){var b=[],f=0,d=-1,h=c.length,k=[0,2,1][c.length%3],f=s,g=E;if(a.btoa){for(;d<h;)b.push(f[c[++d]]);return btoa(b.join(""))}for(--h;d<h;)f=c[++d]<<16|c[++d]<<8|c[++d],b.push(g[f>>18&63],g[f>>12&63],g[f>>6&63],g[f&63]);1<k&&(b[b.length-2]="=");0<k&&(b[b.length-1]="=");return b.join("")}
+a.msgpack={pack:c,unpack:b,worker:"msgpack.js",upload:function(b,e,f){e.method="PUT";e.binary=!0;if(e.worker&&a.Worker){var d=new Worker(msgpack.worker);d.onmessage=function(a){e.data=a.data;t(b,e,f)};d.postMessage({method:"pack",data:e.data})}else e.data=A(c(e.data)),t(b,e,f)},download:function(a,c,b){c.method="GET";c.binary=!0;t(a,c,b)}};var x=/MSIE/.test(navigator.userAgent),u={},s={},E="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".split(""),v=[],f=0,r=0,C=Array.isArray||function(a){return"[object Array]"===
+Object.prototype.toString.call(a)},n=String.fromCharCode,B=512;self.importScripts&&(onmessage=function(a){"pack"===a.data.method?postMessage(A(c(a.data.data))):postMessage(b(a.data.data))});(function(){for(var a=0,c;256>a;++a)c=n(a),u[c]=a,s[a]=c;for(a=128;256>a;++a)u[n(63232+a)]=a})();x&&document.write('<script type="text/vbscript">Function vblen(b)vblen=LenB(b.responseBody)End Function\nFunction vbstr(b)vbstr=CStr(b.responseBody)+chr(0)End Function\x3c/script>')}(this);
+function WearScript(){this._randstr=function(a){for(var c="",b=0;b<a;b++)c+="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".charAt(Math.floor(52*Math.random()));return c};this._cbPrefix="WS"+this._randstr(4);this.callbacks={};this.picarusModelCount=this.cbCount=0;this.Media=function(a,c){c||(c=!1);WSRAW.mediaLoad(a,c);this.play=function(){WSRAW.mediaPlay()}.bind(this);this.pause=function(){WSRAW.mediaPause()}.bind(this);this.stop=function(){WSRAW.mediaStop()}.bind(this)};this.PicarusModel=
+function(a){this.id=a;this.process=function(a,b){b=WS._funcfix(b);WSRAW.picarusModelProcess(this.id,a,WS._funcwrap(function(a){b(atob(a))}))};this.processStream=function(a){a=WS._funcfix(a);WSRAW.picarusModelProcessStream(this.id,WS._funcwrap(function(b){a(atob(b))}))};this.processWarpTargets=function(a){a=WS._funcfix(a);WSRAW.picarusModelProcessWarp(this.id,WS._funcwrap(function(b){a(atob(b))}))}};this.picarusModelFactory=function(a,c){var b=WS.picarusModelCount;WS.picarusModelCount+=1;var h=new WS.PicarusModel(b);
+c=WS._funcfix(c);WSRAW.picarusModelCreate(a,b,WS._funcwrap(function(){c(h)}.bind(this)))};this.PicarusARTag=function(a){this.model=a;this._parseData=function(a){var b=[];if(!a)return b;a=msgpack.unpack(a);if(!a)return b;for(var h=0;h<a[0].length/9;h+=9){var k=[],m=a[0].slice(9*h);k.push([m[1],m[2]]);k.push([m[3],m[4]]);k.push([m[5],m[6]]);k.push([m[7],m[8]]);b.push({id:m[0],xy:k})}return b};this.process=function(a,b){this.model.process(a,function(a){b(this._parseData(a))}.bind(this))};this.processStream=
+function(a){this.model.processStream(function(b){a(this._parseData(b))}.bind(this))};this.processWarpTargets=function(a){this.model.processWarpTargets(function(b){a(this._parseData(b))}.bind(this))}};this.picarusARTagFactory=function(a){var c=btoa(msgpack.pack([{kw:{},name:"picarus.ARMarkerDetector"}]).map(function(a){return String.fromCharCode(a)}).join(""));WS.picarusModelFactory(c,function(b){a(new WS.PicarusARTag(b))}.bind(this))};this.Cards=function(a){this.cards=a||[];this.isFunc=function(a){return"function"===
+typeof a};this.isObj=function(a){return"object"===typeof a};this.isUndef=function(a){return"undefined"===typeof a};this.isStr=function(a){return"string"===typeof a};this.addHTML=function(){var a={card:{type:"html",html:document.getElementById(arguments[0]).innerHTML}},b=Array.prototype.slice.call(arguments).slice(1);return this._add(a,b)};this.add=function(){var a={card:{type:"card",text:arguments[0],info:arguments[1]}},b=Array.prototype.slice.call(arguments).slice(2);return this._add(a,b)};this._add=
+function(a,b){if(0<b.length&&this.isFunc(b[0])||this.isUndef(b[0]))this.isFunc(b[0])&&(a.selected=WS._funcwrap(b[0])),b=b.slice(1);if(0<b.length&&this.isFunc(b[0])||this.isUndef(b[0]))this.isFunc(b[0])&&(a.click=WS._funcwrap(b[0])),b=b.slice(1);if(0<b.length&&this.isObj(b[0]))a.children=b[0].cards,b.slice(1);else if(0<b.length&&0==b.length%2){a.menu=[];for(var h=0;h<b.length&&this.isStr(b[h])&&(this.isFunc(b[h+1])||this.isUndef(b[h+1]));h+=2)a.menu.push({label:b[h],callback:WS._funcwrap(b[h+1])})}this.cards.push(a);
+return this}};this.scriptVersion=function(a){WSRAW.scriptVersion(a)};this.shutdown=function(){WSRAW.shutdown()};this.sensor=function(a){return WSRAW.sensor(a)};this.sensors=function(){return JSON.parse(WSRAW.sensors())};this._funcwrap=function(a){var c={};return a&&"[object Function]"===c.toString.call(a)?(c=this._cbPrefix+this.cbCount,this.cbCount+=1,window[c]=a,c):a};this._funcfix=function(a){return"string"===typeof a?(this.log("Warning: deprecated use of string as a function: "+a),window[a]):a};
+this.publish=function(){var a=msgpack.pack(Array.prototype.slice.call(arguments));WSRAW.publish(arguments[0],btoa(a.map(function(a){return String.fromCharCode(a)}).join("")))};this.subscribe=function(a,c){c=this._funcfix(c);WSRAW.subscribe(a,this._funcwrap(function(a){return c.apply(null,msgpack.unpack(atob(a)))}))};this.sensorOn=function(a,c,b){"string"===typeof a&&(a=this.sensor(a));b?WSRAW.sensorOn(a,c,this._funcwrap(b)):WSRAW.sensorOn(a,c)};this.sensorOff=function(a){"string"===typeof a&&(a=this.sensor(a));
+WSRAW.sensorOff(a)};this.dataLog=function(a,c,b){WSRAW.dataLog(a,c,b)};this.say=function(a){WSRAW.say(a)};this.qr=function(a){a=this._funcfix(a);WSRAW.qr(this._funcwrap(function(c,b){a(atob(c),b)}))};this.log=function(a){WSRAW.log(a)};this.displayWebView=function(){WSRAW.displayWebView()};this.displayWarpView=function(a){a?WSRAW.displayWarpView(JSON.stringify(a)):WSRAW.displayWarpView()};this.warpDraw=function(a,c,b,h,k,m){WSRAW.warpDraw(a,c,b,h,k,m)};this.warpGlassToPreviewH=function(a){a=this._funcfix(a);
+WSRAW.warpGlassToPreviewH(this._funcwrap(function(c){a(JSON.parse(c))}))};this.warpSetOverlay=function(a){WSRAW.warpSetOverlay(a)};this.cvInit=function(a){a=this._funcfix(a);WSRAW.cvInit(this._funcwrap(a))};this.warpPreviewSampleGlass=function(a){a=a?this._funcwrap(this._funcfix(a)):"";WSRAW.warpPreviewSampleGlass(a)};this.displayCardTree=function(){WSRAW.displayCardTree()};this.cardTree=function(a){WSRAW.cardTree(JSON.stringify(a.cards))};this.cameraOn=function(a,c,b,h){c||(c=0);b||(maxwidth=0);
+h?(h=this._funcfix(h),WSRAW.cameraOn(a,c,b,!1,this._funcwrap(h))):WSRAW.cameraOn(a,c,b,!1)};this.cameraOnBackgroundUnsafe=function(a,c,b,h){c||(c=0);b||(maxwidth=0);h?(h=this._funcfix(h),WSRAW.cameraOn(a,c,b,!0,this._funcwrap(h))):WSRAW.cameraOn(a,c,b,!0)};this.cameraPhoto=function(a){a?(a=this._funcfix(a),WSRAW.cameraPhoto(this._funcwrap(a))):WSRAW.cameraPhoto()};this.cameraPhotoData=function(a){a?(a=this._funcfix(a),WSRAW.cameraPhotoData(this._funcwrap(a))):WSRAW.cameraPhoto()};this.cameraVideo=
+function(a){a?(a=this._funcfix(a),WSRAW.cameraVideo(this._funcwrap(a))):WSRAW.cameraVideo()};this.cameraOff=function(){WSRAW.cameraOff()};this.activityCreate=function(){WSRAW.activityCreate()};this.activityDestroy=function(){WSRAW.activityDestroy()};this.wifiOn=function(a){a=this._funcfix(a);WSRAW.wifiOn(this._funcwrap(a))};this.wifiOff=function(){WSRAW.wifiOff()};this.wifiScan=function(){WSRAW.wifiScan()};this.serverConnect=function(a,c){c=this._funcfix(c);WSRAW.serverConnect(a,this._funcwrap(c))};
+this.wake=function(){WSRAW.wake()};this.sound=function(a){WSRAW.sound(a)};this.gestureCallback=function(a,c){c=this._funcfix(c);WSRAW.gestureCallback(a,this._funcwrap(c))};this.speechRecognize=function(a,c){c=this._funcfix(c);WSRAW.speechRecognize(a,this._funcwrap(function(a){c(atob(a))}))};this.liveCardCreate=function(a,c){var b=[],h=Array.prototype.slice.call(arguments).slice(2);0==h.length&&(h.push("Open"),h.push(function(){WS.activityCreate()}),h.push("Shutdown"),h.push(function(){WS.shutdown()}));
+for(var k=0;k<h.length;k+=2)b.push({label:h[k],callback:this._funcwrap(this._funcfix(h[k+1]))});WSRAW.liveCardCreate(a,c,JSON.stringify(b))};this.liveCardDestroy=function(){WSRAW.liveCardDestroy()};this.device=function(){return WSRAW.device()};this.groupDevice=function(){return WSRAW.groupDevice()};this.group=function(){return WSRAW.group()};this.bluetoothList=function(a){a=this._funcfix(a);WSRAW.bluetoothList(this._funcwrap(function(c){a(JSON.parse(c))}))};this.bluetoothRead=function(a,c){c=this._funcfix(c);
+WSRAW.bluetoothRead(a,this._funcwrap(function(a){c(atob(a))}))};this.bluetoothWrite=function(a,c){WSRAW.bluetoothWrite(a,btoa(c))};this.bluetoothEnable=function(){WSRAW.bluetoothEnable()};this.bluetoothDisable=function(){WSRAW.bluetoothDisable()};this.bluetoothBond=function(a,c){WSRAW.bluetoothBond(a,c)};this.bluetoothDiscover=function(a){a=this._funcfix(a);WSRAW.bluetoothDiscover(this._funcwrap(function(c){a(JSON.parse(c))}))};this.pebbleSetTitle=function(a,c){WSRAW.pebbleSetTitle(a,c)};this.pebbleSetSubtitle=
+function(a,c){WSRAW.pebbleSetSubtitle(a,c)};this.pebbleSetBody=function(a,c){WSRAW.pebbleSetBody(a,c)};this.pebbleVibe=function(a){WSRAW.pebbleVibe(a)};this.control=function(a,c){c||(c=!1);WSRAW.control(a,c)};this.picarus=function(a,c,b){b=this._funcfix(b);WSRAW.picarus(a,c,this._funcwrap(function(a){b(atob(a))}))};this.picarusStream=function(a,c){c=this._funcfix(c);WSRAW.picarusStream(a,this._funcwrap(function(a){c(atob(a))}))}}WS=new WearScript;
\ No newline at end of file
diff --git a/WearScript/src/main/java/com/dappervision/wearscript/BackgroundService.java b/WearScript/src/main/java/com/dappervision/wearscript/BackgroundService.java
index f1edc192..29dc5c9d 100644
--- a/WearScript/src/main/java/com/dappervision/wearscript/BackgroundService.java
+++ b/WearScript/src/main/java/com/dappervision/wearscript/BackgroundService.java
@@ -25,7 +25,6 @@
 import com.dappervision.wearscript.events.DataLogEvent;
 import com.dappervision.wearscript.events.JsCall;
 import com.dappervision.wearscript.events.LambdaEvent;
-import com.dappervision.wearscript.events.MediaEvent;
 import com.dappervision.wearscript.events.SayEvent;
 import com.dappervision.wearscript.events.ScreenEvent;
 import com.dappervision.wearscript.events.ScriptEvent;
@@ -45,11 +44,8 @@
 import com.dappervision.wearscript.managers.PicarusManager;
 import com.dappervision.wearscript.managers.WarpManager;
 import com.dappervision.wearscript.managers.WifiManager;
-import com.dappervision.wearscript.ui.MediaPlayerFragment;
 import com.dappervision.wearscript.ui.ScriptActivity;
-import com.dappervision.wearscript.ui.WSActivity;
 import com.getpebble.android.kit.PebbleKit;
-import com.google.android.glass.widget.CardScrollView;
 
 import org.msgpack.MessagePack;
 import org.msgpack.type.Value;
@@ -60,7 +56,7 @@
 import java.util.TreeMap;
 
 public class BackgroundService extends Service implements AudioRecord.OnRecordPositionUpdateListener, OnInitListener {
-    protected static String TAG = "WearScript";
+    protected static String TAG = "BackgroundService";
     private final IBinder mBinder = new LocalBinder();
     private final Object lock = new Object(); // All calls to webview client must acquire lock
     protected TextToSpeech tts;
@@ -92,8 +88,11 @@ static String convertStreamToString(java.io.InputStream is) {
     }
 
     public void updateActivityView(final ActivityEvent.Mode mode) {
-        if (activity == null)
+        Log.d(TAG, "updateActivityView: " + mode.toString());
+        if (activity == null) {
+            Log.d(TAG, "updateActivityView - activity is null, not setting");
             return;
+        }
         final ScriptActivity a = activity;
         a.runOnUiThread(new Thread() {
             public void run() {
@@ -309,6 +308,7 @@ public void onEventMainThread(ScriptEvent e) {
         reset();
         synchronized (lock) {
             webview = createScriptView();
+            Log.d(TAG, "webview.isHardwareAccelerated: " + webview.isHardwareAccelerated());
             updateActivityView(ActivityEvent.Mode.WEBVIEW);
             webview.getSettings().setJavaScriptEnabled(true);
             webview.addJavascriptInterface(new WearScript(this), "WSRAW");
diff --git a/WearScript/src/main/java/com/dappervision/wearscript/ScriptView.java b/WearScript/src/main/java/com/dappervision/wearscript/ScriptView.java
index 6bff5952..a5cb7df9 100644
--- a/WearScript/src/main/java/com/dappervision/wearscript/ScriptView.java
+++ b/WearScript/src/main/java/com/dappervision/wearscript/ScriptView.java
@@ -30,7 +30,10 @@ public class ScriptView extends WebView implements SurfaceHolder.Callback, Direc
     ScriptView(final BackgroundService context) {
         super(context);
         paused = false;
+        // NOTE(brandyn): Fix for KK error: http://stackoverflow.com/questions/20675554/webview-rendering-issue-in-android-kitkat
+        //setLayerType(View.LAYER_TYPE_SOFTWARE, null);
         // Enable localStorage in webview
+        getSettings().setAllowUniversalAccessFromFileURLs(true);
         getSettings().setDomStorageEnabled(true);
         Utils.getEventBus().register(this);
         this.context = context;
diff --git a/WearScript/src/main/java/com/dappervision/wearscript/WearScript.java b/WearScript/src/main/java/com/dappervision/wearscript/WearScript.java
index 72b26a7b..aae58e25 100644
--- a/WearScript/src/main/java/com/dappervision/wearscript/WearScript.java
+++ b/WearScript/src/main/java/com/dappervision/wearscript/WearScript.java
@@ -18,6 +18,7 @@
 import com.dappervision.wearscript.events.JsCall;
 import com.dappervision.wearscript.events.LiveCardEvent;
 import com.dappervision.wearscript.events.LiveCardSetMenuEvent;
+import com.dappervision.wearscript.events.MediaActionEvent;
 import com.dappervision.wearscript.events.MediaEvent;
 import com.dappervision.wearscript.events.PebbleMessageEvent;
 import com.dappervision.wearscript.events.PicarusBenchmarkEvent;
@@ -35,7 +36,6 @@
 import com.dappervision.wearscript.events.ShutdownEvent;
 import com.dappervision.wearscript.events.SoundEvent;
 import com.dappervision.wearscript.events.SpeechRecognizeEvent;
-import com.dappervision.wearscript.events.WarpDrawEvent;
 import com.dappervision.wearscript.events.WarpModeEvent;
 import com.dappervision.wearscript.events.WarpSetAnnotationEvent;
 import com.dappervision.wearscript.events.WarpSetupHomographyEvent;
@@ -159,6 +159,21 @@ public void mediaLoad(String uri, boolean looping){
         }
     }
 
+    @JavascriptInterface
+    public void mediaPlay(){
+        Utils.eventBusPost(new MediaActionEvent("play"));
+    }
+
+    @JavascriptInterface
+    public void mediaPause(){
+        Utils.eventBusPost(new MediaActionEvent("pause"));
+    }
+
+    @JavascriptInterface
+    public void mediaStop(){
+        Utils.eventBusPost(new MediaActionEvent("stop"));
+    }
+
     @JavascriptInterface
     public void serverConnect(String server, String callback) {
         Log.i(TAG, "serverConnect: " + server);
diff --git a/WearScript/src/main/java/com/dappervision/wearscript/events/MediaActionEvent.java b/WearScript/src/main/java/com/dappervision/wearscript/events/MediaActionEvent.java
new file mode 100644
index 00000000..48596a4d
--- /dev/null
+++ b/WearScript/src/main/java/com/dappervision/wearscript/events/MediaActionEvent.java
@@ -0,0 +1,14 @@
+package com.dappervision.wearscript.events;
+
+public class MediaActionEvent {
+
+    private final String action;
+
+    public MediaActionEvent(String action) {
+        this.action = action;
+    }
+
+    public String getAction() {
+        return action;
+    }
+}
diff --git a/WearScript/src/main/java/com/dappervision/wearscript/events/MediaPlayEvent.java b/WearScript/src/main/java/com/dappervision/wearscript/events/MediaPlayEvent.java
deleted file mode 100644
index 7ac83dd3..00000000
--- a/WearScript/src/main/java/com/dappervision/wearscript/events/MediaPlayEvent.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.dappervision.wearscript.events;
-
-public class MediaPlayEvent {
-
-    private final boolean playing;
-
-    public MediaPlayEvent(boolean playing) {
-        this.playing = playing;
-    }
-
-    public boolean isPlaying() {
-        return playing;
-    }
-}
diff --git a/WearScript/src/main/java/com/dappervision/wearscript/managers/BluetoothManager.java b/WearScript/src/main/java/com/dappervision/wearscript/managers/BluetoothManager.java
index e64761e4..08da6f7f 100644
--- a/WearScript/src/main/java/com/dappervision/wearscript/managers/BluetoothManager.java
+++ b/WearScript/src/main/java/com/dappervision/wearscript/managers/BluetoothManager.java
@@ -72,8 +72,8 @@ public void onReceive(Context context, Intent intent) {
                 Method convert = btDeviceInstance.getMethod("convertPinToBytes", String.class);
 
                 String pinString = mDevicePins.get(newDevice.getAddress());
-                if (pinString == null) {
-                    pinString = "1234";
+                if (pinString == null || pinString.equals("")) {
+                    return;
                 }
                 byte[] pin = (byte[]) convert.invoke(newDevice, pinString);
                 Method setPin = btDeviceInstance.getMethod("setPin", byte[].class);
diff --git a/WearScript/src/main/java/com/dappervision/wearscript/managers/ConnectionManager.java b/WearScript/src/main/java/com/dappervision/wearscript/managers/ConnectionManager.java
index 49b55d01..40dffb70 100644
--- a/WearScript/src/main/java/com/dappervision/wearscript/managers/ConnectionManager.java
+++ b/WearScript/src/main/java/com/dappervision/wearscript/managers/ConnectionManager.java
@@ -19,8 +19,11 @@
 import com.dappervision.wearscript.events.ShutdownEvent;
 import com.dappervision.wearscript.events.WarpHEvent;
 
+import org.json.simple.JSONObject;
+import org.json.simple.JSONValue;
 import org.msgpack.MessagePack;
 import org.msgpack.type.Value;
+import org.msgpack.util.json.JSON;
 
 import java.util.List;
 import java.util.TreeMap;
@@ -77,6 +80,7 @@ public void reset() {
             testChannels.add(testChannel);
             TreeSet<String> subscribeChannels = new TreeSet<String>();
             subscribeChannels.add(testChannel);
+            subscribeChannels.add("android");
             subscribeChannels.add(connection.group());
             subscribeChannels.add(connection.groupDevice());
             subscribeChannels.add(GIST_LIST_SYNC_CHAN);
@@ -201,8 +205,7 @@ public boolean exists(String channel) {
     class WearScriptConnectionImpl extends WearScriptConnection {
 
         WearScriptConnectionImpl() {
-            //HardwareDetector.isGlass ? "glass" : "phone"
-            super("glass", ((WifiManager) service.getManager(WifiManager.class)).getMacAddress().replace(":", ""));
+            super(HardwareDetector.isGlass ? "android:glass" : "android:phone", ((WifiManager) service.getManager(WifiManager.class)).getMacAddress().replace(":", ""));
         }
 
         @Override
@@ -230,20 +233,39 @@ public void onReceive(String channel, byte[] dataRaw, List<Value> data) {
             if (isCustomPackage) return;
             // TODO(brandyn): Clean up gist sync behavior
             Log.d(TAG, "onReceive: " + channel);
-            if ((channel.equals(this.groupDevice) || channel.equals(this.group)) && !channel.equals(GIST_LIST_SYNC_CHAN)) {
+            if ((channel.equals(this.groupDevice) || channel.equals(this.group) || channel.equals("android")) && !channel.equals(GIST_LIST_SYNC_CHAN)) {
                 String command = data.get(1).asRawValue().getString();
                 Log.d(TAG, String.format("Got %s %s", channel, command));
                 if (command.equals("script")) {
                     Value[] files = data.get(2).asMapValue().getKeyValueArray();
                     // TODO(brandyn): Verify that writing a script here isn't going to break anything while the old script is running
                     String path = null;
+                    TreeMap<String, String> filePaths = new TreeMap<String, String>();
+                    JSONObject manifest = null;
                     for (int i = 0; i < files.length / 2; i++) {
                         String name = files[i * 2].asRawValue().getString();
                         String pathCur = Utils.SaveData(files[i * 2 + 1].asRawValue().getByteArray(), "scripting/", false, name);
-                        if (name.equals("glass.html") && (path == null || HardwareDetector.isGlass))
-                            path = pathCur;
-                        else if (name.equals("phone.html") && !HardwareDetector.isGlass)
-                            name = pathCur;
+                        filePaths.put(name, pathCur);
+                        if (name.equals("manifest.json")) {
+                            manifest = (JSONObject) JSONValue.parse(files[i * 2 + 1].asRawValue().getString());
+                        }
+                    }
+                    if (manifest != null && manifest.containsKey("scripts")) {
+                        JSONObject scripts = (JSONObject)manifest.get("scripts");
+                        
+                        String scriptName = (String)scripts.get(this.groupDevice());
+                        if (scriptName == null) {
+                            scriptName = (String)scripts.get(this.group());
+                        }
+                        if (scriptName == null) {
+                            scriptName = (String)scripts.get("android");
+                        }
+                        if (scriptName != null) {
+                            Log.d(TAG, "Using script: " + scriptName);
+                            path = filePaths.get(scriptName);
+                        }
+                    } else {
+                        path = filePaths.get("glass.html");
                     }
                     if (path != null) {
                         Utils.eventBusPost(new ScriptEvent(path));
diff --git a/WearScript/src/main/java/com/dappervision/wearscript/ui/WSActivity.java b/WearScript/src/main/java/com/dappervision/wearscript/ui/MediaActivity.java
similarity index 97%
rename from WearScript/src/main/java/com/dappervision/wearscript/ui/WSActivity.java
rename to WearScript/src/main/java/com/dappervision/wearscript/ui/MediaActivity.java
index db3a56c0..cee7d850 100644
--- a/WearScript/src/main/java/com/dappervision/wearscript/ui/WSActivity.java
+++ b/WearScript/src/main/java/com/dappervision/wearscript/ui/MediaActivity.java
@@ -9,7 +9,7 @@
 import com.dappervision.wearscript.R;
 import com.google.android.glass.touchpad.GestureDetector;
 
-public class WSActivity extends FragmentActivity {
+public class MediaActivity extends FragmentActivity {
     public static final String MODE_KEY = "MODE";
     public static final String MODE_MEDIA = "MODE_MEDIA";
     private GestureDetector gestureDetector;
diff --git a/WearScript/src/main/java/com/dappervision/wearscript/ui/MediaPlayerFragment.java b/WearScript/src/main/java/com/dappervision/wearscript/ui/MediaPlayerFragment.java
index 881dde87..3757c36f 100644
--- a/WearScript/src/main/java/com/dappervision/wearscript/ui/MediaPlayerFragment.java
+++ b/WearScript/src/main/java/com/dappervision/wearscript/ui/MediaPlayerFragment.java
@@ -8,12 +8,13 @@
 import android.view.SurfaceView;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.widget.ProgressBar;
 
 import com.dappervision.wearscript.Log;
 import com.dappervision.wearscript.R;
 import com.dappervision.wearscript.Utils;
-import com.dappervision.wearscript.events.MediaPlayEvent;
+import com.dappervision.wearscript.events.MediaActionEvent;
 import com.google.android.glass.touchpad.Gesture;
 
 import java.io.IOException;
@@ -39,6 +40,7 @@ public static MediaPlayerFragment newInstance(Uri uri, boolean looping) {
 
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         Utils.getEventBus().register(this);
         setRetainInstance(true);
         mediaUri = getArguments().getParcelable(ARG_URL);
@@ -62,11 +64,15 @@ private void createMediaPlayer(){
         mp.prepareAsync();
     }
 
-    public void onEvent(MediaPlayEvent e) {
-        if (e.isPlaying()) {
+    public void onEvent(MediaActionEvent e) {
+        String action = e.getAction();
+        if (action.equals("play")) {
             mp.start();
-        } else {
+        } else if (action.equals("stop")) {
             mp.stop();
+            getActivity().finish();
+        } else if (action.equals("pause")) {
+            mp.pause();
         }
     }
 
@@ -98,9 +104,19 @@ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
         return v;
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        Log.d(TAG, "onPause");
+        getActivity().getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        getActivity().finish();
+    }
+
+
     @Override
     public void onDestroy() {
         super.onDestroy();
+        Log.d(TAG, "onDestroy");
         if (mp.isPlaying())
             mp.stop();
         mp.release();
@@ -118,8 +134,9 @@ public boolean onError(MediaPlayer mediaPlayer, int i, int i2) {
             createMediaPlayer();
         }else if (i == MediaPlayer.MEDIA_ERROR_UNKNOWN) {
             Log.w(TAG, "Unknown Error, resetting");
-            mediaPlayer.reset();
-            mediaPlayer.prepareAsync();
+            mediaPlayer.release();
+            mp = null;
+            createMediaPlayer();
         }
         return false;
     }
diff --git a/WearScript/src/main/java/com/dappervision/wearscript/ui/ScriptActivity.java b/WearScript/src/main/java/com/dappervision/wearscript/ui/ScriptActivity.java
index 60e720b3..526d4bb6 100644
--- a/WearScript/src/main/java/com/dappervision/wearscript/ui/ScriptActivity.java
+++ b/WearScript/src/main/java/com/dappervision/wearscript/ui/ScriptActivity.java
@@ -172,8 +172,8 @@ public void onEventBackgroundThread(StartActivityEvent event) {
     }
 
     public void onEventMainThread(MediaEvent e){
-        Intent intent = new Intent(this, WSActivity.class);
-        intent.putExtra(WSActivity.MODE_KEY, WSActivity.MODE_MEDIA);
+        Intent intent = new Intent(this, MediaActivity.class);
+        intent.putExtra(MediaActivity.MODE_KEY, MediaActivity.MODE_MEDIA);
         intent.putExtra(MediaPlayerFragment.ARG_URL, e.getUri());
         intent.putExtra(MediaPlayerFragment.ARG_LOOP, e.isLooping());
         startActivity(intent);