diff --git a/apps/pushups/app.js b/apps/pushups/app.js
index 23c2f57d4..f56e13677 100644
--- a/apps/pushups/app.js
+++ b/apps/pushups/app.js
@@ -1,15 +1,37 @@
+let h = require("heatshrink");
 
 Bangle.loadWidgets();
 
-const ACTIVITIES = ["pushups", "situps", "squats"];
-let routine = [[0, 10], [1, 10], [2, 10]];
+const ACTIVITIES = ["pushups", "situps", "squats", "plank"];
+const IMAGES = [
+  h.decompress(
+    atob(
+      "mEwwhC/AH4A/AH4A/ACcEogXVolEoAuVAAIXYhvdC6vdAAPQL6QuBAAaPRhtNDAgyQDQIXE7qYPC48iMaFM5gWC6kikAXPpvMDAXSC6BIBhoYB5oXBJB4XBOQPc5lCC4IYPC4StBCwUikgvQAAMCC4TlCeZgHFC4YYKFwoADkgXCDBIuHEQgACOpZTKC6oNGiIASC7YA/AH4A/AH4AdA"
+    )
+  ),
+  h.decompress(
+    atob(
+      "mEwwhC/AH4A/ADlEogWUggXBoAuVAAQXXDKQXGJaAXXO4RhVCYSSWGQTZWFy8wC6c0olDmYXTmdEmYXVAARITC4YwTgYXHkUgC6JICgUiDBxIFCwQwTIoIADC6MyC4hIRCwgwRFggwPC4JFESKRbGJB4uFYSMDLI5IPIA7aQkUwA4hIBE5AASC7IA/AH4A/ACwA="
+    )
+  ),
+  h.decompress(
+    atob(
+      "mEwwhC/AFUN7vQC6ndAAIuVAAIwTC/53fU7AAugUjmczmRjCPp4VBAAM9C4h+MgYXDloXRCwczCwpHMCoU4u51RIwc3uAXVw4XSLoZGSL35e/AB0IxAADxvdAAIXX6AX8gBfWGAcikgWCC54ADhpGRAAguDC65GWL35eyF4ZGTC7BJCCygA+"
+    )
+  ),
+  h.decompress(
+    atob(
+      "mEwwhC/AH4A/AH4A/AHkEolAC6lEAAIuVAAIwTC6nd7oXTCoIAB6AXPgVNCwYwCO5siCopIEFxUCkUtC44AMkQX/CowACUogXLQAIXHbAgAHV4QXFTwa7IbwdEoQWCEg4sIC4kgHhAtJC4RULAAJQBC4qZKE4oXENwYXPP5KGLFJgA/AH4A/AH4AUA=="
+    )
+  )
+];
 
 const DETECTORS = [
   (xyz) => {
-    return (xyz.y > 0.4)?1:0;
+    return xyz.y > 0.4 ? 1 : 0;
   },
   (xyz) => {
-    return (xyz.x > 0)?1:0;
+    return xyz.x > 0 ? 1 : 0;
   },
   (xyz) => {
     if (xyz.z > -1) {
@@ -19,32 +41,129 @@ const DETECTORS = [
     } else {
       return null;
     }
-  }
+  },
+  null
 ];
 
-let routine_step = 0;
-let current_status = 0;
+class FitnessStatus {
+  constructor() {
+    this.routine = [
+      [0, 10],
+      [1, 10],
+      [2, 10],
+      [3, 30]
+    ];
+    this.routine_step = 0;
+    this.current_status = 0;
 
-// to get rid of noise we'll need to count how many measures confirm where we think we are
-let counts_in_opposite_status = 0;
-let remaining = routine[routine_step][1];
+    // to get rid of noise we'll need to count how many measures confirm where we think we are
+    this.counts_in_opposite_status = 0;
+    this.remaining = this.routine[this.routine_step][1];
+    this.activity_start = getTime();
+  }
 
+  display() {
+    g.clear();
+    g.setColor(0, 0, 0);
+    let activity = this.routine[this.routine_step][0];
+    let countdown = this.remaining;
+    if (DETECTORS[activity] === null) {
+      countdown = this.remaining - Math.floor(getTime() - this.activity_start);
+    }
+    g.setFont("Vector:70")
+      .setFontAlign(0, 0)
+      .drawString(
+        "" + countdown,
+        (g.getWidth() * 3) / 10,
+        g.getHeight() / 2
+      );
+    let activity_name = ACTIVITIES[activity];
+    g.drawImage(IMAGES[activity], g.getWidth() / 2, (g.getHeight() * 1) / 5, {
+      scale: 2,
+    });
+    g.setFont("6x8:2")
+      .setFontAlign(0, 1)
+      .drawString(activity_name, g.getWidth() / 2, g.getHeight());
+    Bangle.drawWidgets();
+    g.flip();
+  }
 
-function display() {
-  g.clear();
-  g.setColor(0, 0, 0);
-  g.setFont("Vector:80").setFontAlign(0, 0).drawString(""+remaining, g.getWidth()/2, g.getHeight()/2);
-  let activity = ACTIVITIES[routine[routine_step][0]];
-  g.setFont("6x8:2").setFontAlign(0, 1).drawString(activity, g.getWidth()/2, g.getHeight());
-  Bangle.drawWidgets();
-  g.flip();
+  first_activity() {
+    return this.routine_step == 0;
+  }
+
+  last_activity() {
+    return this.routine_step == this.routine.length - 1;
+  }
+
+  next_activity() {
+    this.routine_step += 1;
+    if (this.routine_step >= this.routine.length) {
+      load();
+    }
+    this.remaining = this.routine[this.routine_step][1];
+    // this.display();
+    this.activity_start = getTime();
+    this.current_status = 0;
+    this.counts_in_opposite_status = 0;
+  }
+
+  previous_activity() {
+    this.routine_step -= 1;
+    this.remaining = this.routine[this.routine_step][1];
+    // this.display();
+    this.activity_start = getTime();
+    this.current_status = 0;
+    this.counts_in_opposite_status = 0;
+  }
+
+  detect(xyz) {
+    let activity = this.routine[this.routine_step][0];
+    let detector = DETECTORS[activity];
+    if (detector === null) {
+      // it's time based
+      let activity_duration = getTime() - this.activity_start;
+      if (activity_duration > this.remaining) {
+        Bangle.buzz(500).then(() => {
+          status.next_activity();
+        });
+      }
+      return;
+    }
+    // it's movement based
+    let new_status = DETECTORS[activity](xyz);
+    if (new_status === null) {
+      return;
+    }
+    if (new_status != this.current_status) {
+      this.counts_in_opposite_status += 1;
+
+      // we consider 6 counts to smooth out noise
+      if (this.counts_in_opposite_status == 6) {
+        this.current_status = 1 - this.current_status;
+        this.counts_in_opposite_status = 0;
+        if (this.current_status == 0) {
+          this.remaining -= 1;
+          // this.display();
+          if (this.remaining == 0) {
+            Bangle.buzz(500).then(() => {
+              status.next_activity();
+            });
+          }
+        }
+        Bangle.buzz(100);
+      }
+    } else {
+      this.counts_in_opposite_status = 0;
+    }
+  }
 }
 
-display();
+let status = new FitnessStatus();
+// status.display();
 
 Bangle.setPollInterval(80);
 
-
 setWatch(
   function () {
     load();
@@ -55,54 +174,27 @@ setWatch(
   }
 );
 
-Bangle.on('swipe', function(directionLR, directionUD) { 
+Bangle.on("swipe", function (directionLR, directionUD) {
   if (directionUD == -1) {
-    remaining += 1;
+    status.remaining += 1;
   } else if (directionUD == 1) {
-    remaining = Math.max(remaining-1, 1);
+    status.remaining = Math.max(status.remaining - 1, 1);
   } else if (directionLR == -1) {
-    if (routine_step < routine.length -1) {
-      routine_step += 1;
-      remaining = routine[routine_step][1];
+    if (!status.last_activity()) {
+      status.next_activity();
     }
   } else if (directionLR == 1) {
-    if (routine_step > 0) {
-      routine_step -= 1;
-      remaining = routine[routine_step][1];
+    if (!status.first_activity()) {
+      status.previous_activity();
     }
   }
-  display();
+  // status.display();
 });
 
-Bangle.on('accel', function(xyz) { 
-  let activity = routine[routine_step][0];
-  let new_status = DETECTORS[activity](xyz);
-  if (new_status === null) {
-    return;
-  }
-  if (new_status != current_status) {
-    counts_in_opposite_status += 1;
-
-    if (counts_in_opposite_status == 6) {
-      current_status = 1-current_status;
-      counts_in_opposite_status = 0;
-      if (current_status == 0) {
-        remaining -= 1;
-        display();
-        if (remaining == 0) {
-          Bangle.buzz(500).then(() => {
-            routine_step += 1;
-            if (routine_step >= routine.length) {
-              load();
-            }
-            remaining = routine[routine_step][1];
-            display();
-          })
-        }
-      }
-      Bangle.buzz(100);
-    }
-  } else {
-    counts_in_opposite_status = 0;
-  }
+Bangle.on("accel", function (xyz) {
+  status.detect(xyz);
 });
+
+setInterval(() => {
+  status.display();
+}, 250);