diff --git a/apps/buffgym/buffgym-exercise.js b/apps/buffgym/buffgym-exercise.js
index 7d631182e..ea20aa132 100644
--- a/apps/buffgym/buffgym-exercise.js
+++ b/apps/buffgym/buffgym-exercise.js
@@ -4,10 +4,10 @@ exports = class Exercise {
     this.sets = [];
     this.title = params.title;
     this.weight = params.weight;
+    this.weightIncrement = params.weightIncrement;
     this.unit = params.unit;
     this.restPeriod = params.restPeriod;
     this._originalRestPeriod = params.restPeriod;
-    this._weightIncrement = params.weightIncrement;
     this._restTimeout = null;
     this._restInterval = null;
     this._state = null;
@@ -50,7 +50,7 @@ exports = class Exercise {
 
   setCompleted() {
     if (!this.canSetCompleted()) throw "All sets must be completed";
-    if (this.canProgress()) this.weight += this._weightIncrement;
+    if (this.canProgress()) this.weight += this.weightIncrement;
     this.completed = true;
   }
 
diff --git a/apps/buffgym/buffgym-workout.js b/apps/buffgym/buffgym-workout.js
index 811125293..124c27f4b 100644
--- a/apps/buffgym/buffgym-workout.js
+++ b/apps/buffgym/buffgym-workout.js
@@ -27,8 +27,30 @@ exports = class Workout {
     return !!this.completed;
   }
 
-  static fromJSON(workout) {
+  static fromJSON(workoutJSON) {
+    const Set = require("buffgym-set.js");
+    const Exercise = require("buffgym-exercise.js");
+    const workout = new this({
+      title: workoutJSON.title,
+    });
+    const exercises = workoutJSON.exercises.map(exerciseJSON => {
+      const exercise = new Exercise({
+        title: exerciseJSON.title,
+        weight: exerciseJSON.weight,
+        weightIncrement: exerciseJSON.weightIncrement,
+        unit: exerciseJSON.unit,
+        restPeriod: exerciseJSON.restPeriod,
+      });
+      exerciseJSON.sets.forEach(setJSON => {
+        exercise.addSet(new Set(setJSON));
+      });
 
+      return exercise;
+    });
+
+    workout.addExercises(exercises);
+
+    return workout;
   }
 
   toJSON() {
@@ -38,6 +60,7 @@ exports = class Workout {
         return {
           title: exercise.title,
           weight: exercise.weight,
+          weightIncrement: exercise.weightIncrement,
           unit: exercise.unit,
           sets: exercise.sets.map(set => set.maxReps),
           restPeriod: exercise.restPeriod,
diff --git a/apps/buffgym/buffgym.app.js b/apps/buffgym/buffgym.app.js
index 2c7416dba..fc2be83f9 100755
--- a/apps/buffgym/buffgym.app.js
+++ b/apps/buffgym/buffgym.app.js
@@ -246,34 +246,15 @@ function getWorkoutIndex() {
 }
 
 function buildWorkout(fName) {
-  const Set = require("buffgym-set.js");
-  const Exercise = require("buffgym-exercise.js");
   const Workout = require("buffgym-workout.js");
   const workoutJSON = require("Storage").readJSON(fName);
-  const workout = new Workout({
-    title: workoutJSON.title,
-  });
-  const exercises = workoutJSON.exercises.map(exerciseJSON => {
-    const exercise = new Exercise({
-      title: exerciseJSON.title,
-      weight: exerciseJSON.weight,
-      weightIncrement: exerciseJSON.weightIncrement,
-      unit: exerciseJSON.unit,
-      restPeriod: exerciseJSON.restPeriod,
-    });
-    exerciseJSON.sets.forEach(setJSON => {
-      exercise.addSet(new Set(setJSON));
-    });
-
-    return exercise;
-  });
-  workout.addExercises(exercises);
+  const workout = Workout.fromJSON(workoutJSON);
 
   return workout;
 }
 
 function saveWorkout(workout) {
-  const fName = getWorkoutIndex().find(workout => workout.title === workout.title).file;
+  const fName = getWorkoutIndex().find(w => w.title === workout.title).file;
   require("Storage").writeJSON(fName, workout.toJSON());
 }