diff --git a/src/App.vue b/src/App.vue
index e008eea..b468954 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -157,28 +157,18 @@
 
         <v-row dense>
           <v-col :cols="12">
-            <v-btn v-if="currentgame == 0" x-small rounded @click="jumptobra">Bra</v-btn>
-            <v-btn v-if="currentgame == 0 || currentgame == 1" x-small rounded @click="jumptotits">Tits</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded @click="jumptopanties">Panties</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded @click="jumptoass">Show Ass</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded @click="jumptopussy">Show Pussy</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded @click="jumptosextoy">Get Toy</v-btn>
+            <template v-for="(l,i) in games[currentgame].levels">
+              <v-btn  :key="i" v-if="l.jumptask && l.jumptask.type=='normal'" @click="leveljump(l.index)" x-small rounded>{{ l.jumptask.name }}</v-btn>
+            </template>
           </v-col>
         </v-row>
 
 
         <v-row dense>
           <v-col :cols="12">
-            <v-btn v-if="currentgame == 0" x-small rounded color="primary" @click="jumptopantystuffing">Panty Stuffing</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded color="primary" @click="jumptoice">Ice Cubes</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded color="primary" @click="jumptocable">Cable</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded color="primary" @click="jumptocandle">Candle</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded color="primary" @click="jumptoskype">Skype/Snap</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded color="primary" @click="jumptowriting">Writing</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded color="primary" @click="jumptopens">Pens</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded color="primary" @click="jumptoclamps">Clamps</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded color="primary" @click="jumptorope">Rope</v-btn>
-            <v-btn v-if="currentgame == 0" x-small rounded color="primary" @click="jumptoslaveposes">Slave Poses</v-btn>
+            <template v-for="(l,i) in games[currentgame].levels">
+              <v-btn :key="i" v-if="l.jumptask && l.jumptask.type=='kinky'" @click="leveljump(l.index)" x-small rounded color="primary">{{ l.jumptask.name }}</v-btn>
+            </template>
           </v-col>
         </v-row>
 
@@ -357,96 +347,6 @@ export default {
       this.ready = true;
       this.reset();
     },
-    leveljump: function (i) {
-      this.ready = false;
-      this.currentLevel = i;
-      this.ready = true;
-    },
-    jumptobra: function() {
-      this.ready = false;
-      this.currentLevel = 11;
-      this.ready = true;
-    },
-    jumptotits: function () {
-      this.ready = false;
-      if (this.currentgame == 0) {
-        this.currentLevel = 2;
-      }
-      else if (this.currentgame == 1) {
-        this.currentLevel = 1;
-      }
-      this.ready = true;
-    },
-    jumptopanties: function () {
-      this.ready = false;
-      this.currentLevel = 23;
-      this.ready = true;
-    },
-    jumptoass: function () {
-      this.ready = false;
-      this.currentLevel = 26;
-      this.ready = true;
-    },
-    jumptopussy: function () {
-      this.ready = false;
-      this.currentLevel = 33;
-      this.ready = true;
-    },
-    jumptosextoy: function () {
-      this.ready = false;
-      this.currentLevel = 43;
-      this.ready = true;
-    },
-    jumptopantystuffing: function() {
-      this.ready = false;
-      this.currentLevel = 63;
-      this.ready = true;
-    },
-    jumptoice: function() {
-      this.ready = false;
-      this.currentLevel = 66;
-      this.ready = true;
-    },
-    jumptocable: function () {
-      this.ready = false;
-      this.currentLevel = 67;
-      this.ready = true;
-    },
-    jumptocandle: function () {
-      this.ready = false;
-      this.currentLevel = 68;
-      this.ready = true;
-    },
-    jumptoskype: function () {
-      this.ready = false;
-      this.currentLevel = 69;
-      this.ready = true;
-    },
-    jumptowriting: function () {
-      this.ready = false;
-      this.currentLevel = 70;
-      this.ready = true;
-    },
-    jumptopens: function() {
-      this.ready = false;
-      this.currentLevel = 73;
-      this.ready = true;
-    },
-    jumptoclamps: function () {
-      this.ready = false;
-      this.currentLevel = 74;
-      this.ready = true;
-    },
-    jumptorope: function() {
-      this.ready = false;
-      this.currentLevel = 78;
-      this.ready = true;
-    },
-    jumptoslaveposes: function () {
-      this.ready = false;
-      this.currentLevel = 79;
-      this.ready = true;
-    },
     /*startoverlay: function() {
       this.overlayimg = this.overlayselect;
       this.showoverlay = true;
@@ -494,12 +394,21 @@ export default {
           background: "assets/g1t1.webm",
           task: "Show a Peace Sign",
           points: 0,
+          jumptask: {
+            name: "Jump Test",
+            type: "normal",
+          }
         }, {
           title: "START - Thumbs Up",
           foreground: "assets/white.png-trans.png",
           background: "assets/g1t2.webm",
           task: "Give a thumbs up",
           points: 0,
+          jumptask: {
+            name: "Dirty Jump Task",
+            type: "kinky"
+          }
+
         }]
       }, {
         gamename: "Sweet Girl Game",