diff --git a/client/src/scenes/cryp.list.js b/client/src/scenes/cryp.list.js
old mode 100644
new mode 100755
index b7aa761c..8950a7db
--- a/client/src/scenes/cryp.list.js
+++ b/client/src/scenes/cryp.list.js
@@ -10,6 +10,7 @@ class CrypList extends Phaser.Scene {
     create() {
         this.registry.events.on('changedata', this.updateData, this);
         this.input.on('gameobjectup', this.clickHandler, this);
+        this.CrypPage = this.scene.get('CrypPage');
         console.log('creating');
         return true;
     }
@@ -29,8 +30,8 @@ class CrypList extends Phaser.Scene {
 
     renderCryps(cryps) {
         if (!cryps) return true;
-        console.log(JSON.stringify(this.children.list));
-        console.log(this.children.length);
+        // console.log(JSON.stringify(this.children.list));
+        // console.log(this.children.length);
         this.redraw();
 
         cryps.forEach((cryp, i) => {
@@ -42,8 +43,8 @@ class CrypList extends Phaser.Scene {
     }
 
     clickHandler(pointer, crypBox) {
-        console.log(crypBox);
-        this.registry.set('activeCryp', Object.create(crypBox.cryp));
+        this.CrypPage.redraw();
+        this.CrypPage.renderCryp(crypBox.cryp);
     }
 }
 
diff --git a/client/src/scenes/cryp.row.js b/client/src/scenes/cryp.row.js
old mode 100644
new mode 100755
index d8e3b77b..360d9887
--- a/client/src/scenes/cryp.row.js
+++ b/client/src/scenes/cryp.row.js
@@ -12,7 +12,6 @@ const xPos = i => 0;
 const yPos = i => (i * ROW_HEIGHT + ROW_MARGIN) + TOP_MARGIN;
 
 function crypRow(list, cryp, i) {
-    console.log(i);
     const X_ORIGIN = xPos(i);
     const Y_ORIGIN = yPos(i);
 
diff --git a/client/src/scenes/cryps.js b/client/src/scenes/cryps.js
old mode 100644
new mode 100755
index 224b50dd..12946e41
--- a/client/src/scenes/cryps.js
+++ b/client/src/scenes/cryps.js
@@ -3,6 +3,7 @@ const Phaser = require('phaser');
 const CrypList = require('./cryp.list');
 const CrypPage = require('./cryp.page');
 const Menu = require('./menu');
+const Passives = require('./passives');
 // const Passives = require('./passives');
 
 function renderCryps(store) {
@@ -24,6 +25,7 @@ function renderCryps(store) {
             Menu,
             CrypList,
             CrypPage,
+            Passives,
         ],
     };
 
@@ -33,7 +35,8 @@ function renderCryps(store) {
         const state = store.getState();
         game.registry.set('cryps', state.cryps);
     });
-
+    window.addEventListener('mouseup', () => game.registry.set('pan', false));
+    window.addEventListener('mousedown', () => game.registry.set('pan', true));
     window.addEventListener('resize', () => game.resize(window.innerWidth, window.innerHeight), false);
 
     return game;
diff --git a/client/src/scenes/menu.js b/client/src/scenes/menu.js
old mode 100644
new mode 100755
index 0012d59e..46b9f020
--- a/client/src/scenes/menu.js
+++ b/client/src/scenes/menu.js
@@ -6,7 +6,11 @@ class Menu extends Phaser.Scene {
     }
 
     create() {
+        this.scene.sleep('Passives');
         this.add.text(0, 0, 'cryps.gg',  { fontFamily: 'Arial', fontSize: 24, color: '#ffffff', fontStyle: 'bold' });
+        this.input.keyboard.on('keydown_F', () => {
+            this.scene.wake('Passives');
+        }, 0, this);
     }
 }
 
diff --git a/client/src/scenes/passives.js b/client/src/scenes/passives.js
index 6d4bade1..94fffeb0 100755
--- a/client/src/scenes/passives.js
+++ b/client/src/scenes/passives.js
@@ -9,7 +9,7 @@ const passiveDataEdge = require('./passive.data.edge');
 
 class PhaserPassives extends Phaser.Scene {
     constructor() {
-        super('passives');
+        super({ key: 'Passives', active: true });
     }
 
     preload() {
@@ -73,7 +73,7 @@ class PhaserPassives extends Phaser.Scene {
         });
         this.input.on('pointermove', (pointer) => {
             const zoomFactor = 2 / this.cameras.main.zoom;
-            if (this.pan) {
+            if (this.registry.get('pan')) {
                 const points = pointer.getInterpolatedPosition(2);
                 this.cameras.main.scrollX -= zoomFactor * (points[1].x - points[0].x);
                 this.cameras.main.scrollY -= zoomFactor * (points[1].y - points[0].y);
@@ -82,8 +82,8 @@ class PhaserPassives extends Phaser.Scene {
         this.input.keyboard.on('keydown_A', () => {
             this.updatePassives(); // Will update nodes from state
         }, 0, this);
-        this.input.keyboard.on('keydown_S', () => {
-            this.scene.switch('combat');
+        this.input.keyboard.on('keydown_G', () => {
+            this.scene.sleep('Passives');
         }, 0, this);
     }
 
@@ -98,7 +98,6 @@ class PhaserPassives extends Phaser.Scene {
             } else {
                 this.graphics.lineStyle(2, 0xffffff, 0.2);
             }
-            // console.log(drawEdge);
             this.graphics.lineBetween(drawEdge[0].x, drawEdge[0].y, drawEdge[1].x, drawEdge[1].y);
         });
     }