diff --git a/Workout.js b/Workout.js
index 24ee94d..e8f5703 100644
--- a/Workout.js
+++ b/Workout.js
@@ -13,6 +13,7 @@ constructor(cont, plan) {
     // Status tracking information
     this.action = "";
     this.set_idx = 0;
+    this.set_repeat_idx = 0;
     this.exercise_idx = 0;
     this.workout_done = 0;
 
@@ -28,9 +29,21 @@ text_element(typ, txt) {
     return el;
 }
 
+// ----------
+progress_indicator(id) {
+    const indicator = this.text_element("div", " ");
+    indicator.setAttribute("id", id);
+    indicator.classList.add("progress-indicator");
+    indicator.classList.add("pending");
+    return indicator;
+}
+
 // ----------
 render_workout_header() {
-    this.container.appendChild(this.text_element("h1", this.plan.name));
+    const hdr = this.text_element("h1", this.plan.name);
+    const wo_indicator = this.progress_indicator("wo-indicator");
+    hdr.appendChild(wo_indicator);
+    this.container.appendChild(hdr);
 }
 
 // ----------
@@ -48,8 +61,9 @@ render_debug_status() {
 update_debug_info() {
     if (this.show_debug_status) {
         const dt = this.container.querySelector("#app_debug_div");
+        const curr_set_repeat_max_idx = this.plan.set[this.set_idx].count-1;
         const done_str = (this.workout_done === 1) ? "Done " : "";
-        dt.textContent = `${done_str}Action: ${this.action} Current: Set-${this.set_idx}/Exercise-${this.exercise_idx}`;
+        dt.textContent = `${done_str}Action: ${this.action} Current: Set-${this.set_idx} [${this.set_repeat_idx}/${curr_set_repeat_max_idx}]/Exercise-${this.exercise_idx}`;
     }
 }
 
@@ -68,10 +82,13 @@ render_exercise(prnt, el, idx) {
     let col = sts_td;
     col.classList.add("col-status");
     tblr.appendChild(col);
+    el.done = 0;
+
     // Name
     col = this.text_element("td", el.name);
     col.classList.add("col-name");
     tblr.appendChild(col);
+
     // Pattern/count
     col = this.text_element("td", `${el.pattern} x ${el.count}`);
     col.classList.add("col-pattern-count");
@@ -88,7 +105,12 @@ render_set(el, idx) {
     const tbl = document.createElement("table");
     tbl.setAttribute("class", `set-table set-table-idx-${idx}`);
 
-    tbl.appendChild(this.text_element("caption", el.name));
+    const tcap = this.text_element("caption", el.name);
+    for (var i = 0; i < el.count; i++) {
+        const set_indicator = this.progress_indicator(`set-${idx}-${i}-indicator`);
+        tcap.appendChild(set_indicator);
+    }
+    tbl.appendChild(tcap);
 
     let show_header = 0;
     if (show_header) {
@@ -113,8 +135,8 @@ render_set(el, idx) {
     // Content of table - exercises in the set
     const tblb = document.createElement("tbody");
 
-    el.exercise.forEach(function(el,idx) {
-        wo.render_exercise(tblb, el, idx);
+    el.exercise.forEach(function(ex_el,idx) {
+        wo.render_exercise(tblb, ex_el, idx);
     });
     tbl.appendChild(tblb);
 
@@ -130,101 +152,228 @@ render_workout() {
     }
     this.plan.set.forEach(function(el,idx) {
         wo.render_set(el, idx);
-    })
+    });
 
     this.update_debug_info();
 }
 
 // ----------
 update_active_item() {
+    let wo = this;
     // Make current active exercise row inactive
     const curr_active_tr = this.container.querySelector(".exercise-row.active");
+    let wo_set_idx = this.set_idx;
+    let wo_exercise_idx = this.exercise_idx;
+    let wo_set_repeat_idx = this.set_repeat_idx;
+
+    const max_set_idx = this.plan.set.length-1;
+    const max_set_repeat_idx = this.plan.set[max_set_idx].count-1;
+    const max_exercise_idx = this.plan.set[max_set_idx].exercise.length-1;
+
     if (curr_active_tr != null) {
         curr_active_tr.classList.remove("active");
     }
 
     // Set active exercise row
-    let qstr = `table.set-table-idx-${this.set_idx} tr.exercise-idx-${this.exercise_idx}`;
-    console.log(`Looking for ${qstr}`);
+    let qstr = `table.set-table-idx-${wo_set_idx} tr.exercise-idx-${wo_exercise_idx}`;
+    console.log(`update_active_item - Looking for ${qstr}`);
     const next_active_tr = this.container.querySelector(qstr);
-    console.log(next_active_tr);
     if (next_active_tr != null) {
         next_active_tr.classList.add("active");
     }
 
+    // Set set repeat indicators
+    let set_tables = this.container.querySelectorAll(".set-table");
+    set_tables.forEach(function(stbl, tidx) {
+        let indicators = stbl.querySelectorAll(".progress-indicator");
+        indicators.forEach(function(ids, iidx) {
+            let ind_selector = `#set-${tidx}-${iidx}-indicator`;
+            console.log(`update_active_item - Ind: ${ind_selector} for set_idx ${wo_set_idx} repeat_idx ${wo_set_repeat_idx}`);
+
+            // if (stbl.querySelector(ind_selector) == null) return;
+
+            console.log(`update_active_item - Ind: tidx ${tidx} is ?? set_idx ${wo_set_idx}`);
+            if (tidx < wo_set_idx) {
+                stbl.querySelector(ind_selector).classList.remove("pending");
+                stbl.querySelector(ind_selector).classList.remove("active");
+                stbl.querySelector(ind_selector).classList.add("done");
+            }
+            else if (tidx > wo_set_idx) {
+                stbl.querySelector(ind_selector).classList.remove("done");
+                stbl.querySelector(ind_selector).classList.remove("active");
+                stbl.querySelector(ind_selector).classList.add("pending");
+            }
+            else if (tidx == wo_set_idx) {
+                const ex_chkbox = stbl.querySelector(`tr.exercise-idx-${wo_exercise_idx} input`);
+                if ((iidx < wo_set_repeat_idx)
+                    // || ((iidx == wo_set_repeat_idx) && ex_chkbox.checked)
+                    || ((iidx == wo_set_repeat_idx) && wo.plan.set[tidx].exercise[wo_exercise_idx].done)
+                    ){
+                    console.log(`update_active_item - Ind: iidx ${iidx} is < repeat_idx ${wo_set_repeat_idx} DONE`);
+                    stbl.querySelector(ind_selector).classList.remove("pending");
+                    stbl.querySelector(ind_selector).classList.remove("active");
+                    stbl.querySelector(ind_selector).classList.add("done");
+                }
+                else if (iidx > wo_set_repeat_idx) {
+                    console.log(`update_active_item - Ind: iidx ${iidx} is > repeat_idx ${wo_set_repeat_idx} PENDING`);
+                    stbl.querySelector(ind_selector).classList.remove("done");
+                    stbl.querySelector(ind_selector).classList.remove("active");
+                    stbl.querySelector(ind_selector).classList.add("pending");
+                } else {
+                    console.log(`update_active_item - Ind: iidx ${iidx} is = repeat_idx ${wo_set_repeat_idx} ACTIVE`);
+                    stbl.querySelector(ind_selector).classList.remove("pending");
+                    stbl.querySelector(ind_selector).classList.remove("done");
+                    stbl.querySelector(ind_selector).classList.add("active");
+                }
+            }
+        });
+    });
+
+    this.plan.set.forEach(function(el,idx) {
+        let sidx = idx;
+        el.exercise.forEach(function(eel, eidx) {
+            let qstr = `table.set-table-idx-${sidx} tr.exercise-idx-${eidx}`;
+            const active_tr = wo.container.querySelector(qstr);
+            active_tr.classList.remove("exercise-pending");
+
+            qstr = `table.set-table-idx-${sidx} tr.exercise-idx-${eidx} input`;
+            const active_chkbox = wo.container.querySelector(qstr);
+            active_chkbox.disabled = true;
+            active_chkbox.checked = (wo.plan.set[sidx].exercise[eidx].done == 1);
+        });
+    });
+
     // Mark workout done
-    qstr = `table tr.exercise-pending`;
-    let pending_trs = this.container.querySelectorAll(qstr);
-    console.log(`Remaining to be done ${pending_trs.length}`);
-    if (pending_trs.length === 0) {
-        this.workout_done = 1;
+    if (this.workout_done == 1) {
+        const wo_indicator = this.container.querySelector("#wo-indicator");
+        wo_indicator.classList.remove("pending");
+        wo_indicator.classList.add("done");
     }
 }
 
 // ----------
 handle_exercise_advance() {
     const curr_exercise_max_idx = this.plan.set[this.set_idx].exercise.length-1;
+    const curr_set_repeat_max_idx = this.plan.set[this.set_idx].count-1;
     const curr_set_max_idx = this.plan.set.length-1;
 
-    console.log(`workout done ${this.workout_done} curr_exercise_max_idx = ${curr_exercise_max_idx} curr_set_max_idx = ${curr_set_max_idx}`);
+    console.log(`handle_exercise_advance - Workout done ${this.workout_done} curr_exercise_max_idx = ${curr_exercise_max_idx} curr_set_max_idx = ${curr_set_max_idx}`);
+
+    this.handle_exercise_done();
 
     if (this.exercise_idx === curr_exercise_max_idx) {
-        if (this.set_idx === curr_set_max_idx) {
-            if (this.workout_done === 1) {
-                console.log("Exercise done");
+        if (this.set_repeat_idx == curr_set_repeat_max_idx) {
+            if (this.set_idx === curr_set_max_idx) {
+                if (this.workout_done === 1) {
+                    console.log("handle_exercise_advance - Exercise done");
+                }
+            } else {
+                this.set_idx += 1;
+                this.set_repeat_idx = 0;
+                this.exercise_idx = 0;
+                this.handle_set_undone();
             }
         } else {
-            this.set_idx += 1;
+            this.set_repeat_idx += 1;
             this.exercise_idx = 0;
+            this.handle_set_undone();
         }
     } else {
         this.exercise_idx += 1;
     }
-
-    this.update_active_item();
 }
 
 // ----------
 handle_exercise_regress() {
     const curr_set_max_idx = this.plan.set.length-1;
-
-    console.log(`workout done ${this.workout_done}`);
+    const curr_set_repeat_max_idx = this.plan.set[this.set_idx].count-1;
 
     if (this.exercise_idx === 0) {
-        if (this.set_idx === 0) {
-            console.log("Exercise start");
+        if (this.set_repeat_idx === 0) {
+            if (this.set_idx === 0) {
+                console.log("handle_exercise_regress - Exercise start");
+            } else {
+                this.set_idx -= 1;
+                this.set_repeat_idx = this.plan.set[this.set_idx].count-1;
+                this.exercise_idx = this.plan.set[this.set_idx].exercise.length-1;
+                this.handle_set_done();
+            }
         } else {
-            this.set_idx -= 1;
+            this.set_repeat_idx -= 1;
             this.exercise_idx = this.plan.set[this.set_idx].exercise.length-1;
+            this.handle_set_done();
         }
     } else {
         this.exercise_idx -= 1;
     }
 
-    this.update_active_item();
+    this.handle_exercise_undone();
 }
 
 // ----------
 handle_exercise_done() {
-    // Set active exercise row
-    let qstr = `table.set-table-idx-${this.set_idx} tr.exercise-idx-${this.exercise_idx} input`;
-    console.log(`Looking for ${qstr}`);
-    const active_chkbox = this.container.querySelector(qstr);
-
-    if (!active_chkbox.checked) {
-        active_chkbox.checked = true;
-        active_chkbox.disabled = true;
-        qstr = `table.set-table-idx-${this.set_idx} tr.exercise-idx-${this.exercise_idx}`;
-        const active_tr = this.container.querySelector(qstr);
-        active_tr.classList.remove("exercise-pending");
+    if (this.plan.set[this.set_idx].exercise[this.exercise_idx].done == 0) {
+        this.plan.set[this.set_idx].exercise[this.exercise_idx].done = 1;
     }
 
-    this.update_active_item();
+    console.log(this.plan.set[this.set_idx]);
+
+    this.handle_workout_done();
+}
+
+// ----------
+handle_exercise_undone() {
+    if (this.plan.set[this.set_idx].exercise[this.exercise_idx].done == 1) {
+        this.plan.set[this.set_idx].exercise[this.exercise_idx].done = 0;
+    }
+}
+
+// ----------
+handle_set_done() {
+    // Set active exercise row
+    let qstr = `table.set-table-idx-${this.set_idx} tr input`;
+    console.log(`handle_set_done - Looking for ${qstr}`);
+
+    this.plan.set[this.set_idx].exercise.forEach(function(ex, idx) {
+        ex.done = 1;
+    });
+}
+
+// ----------
+handle_set_undone() {
+    // Set active exercise row
+    let qstr = `table.set-table-idx-${this.set_idx} tr input`;
+    console.log(`handle_set_undone - Looking for ${qstr}`);
+
+    this.plan.set[this.set_idx].exercise.forEach(function(ex, idx) {
+        ex.done = 0;
+    });
+}
+
+// ----------
+handle_workout_done() {
+    let wo = this;
+
+    const max_set_idx = this.plan.set.length-1;
+    const max_set_repeat_idx = this.plan.set[max_set_idx].count-1;
+    const max_exercise_idx = this.plan.set[max_set_idx].exercise.length-1;
+
+    if ((this.set_idx ===  max_set_idx)
+        && (this.set_repeat_idx ===  max_set_repeat_idx)
+        && (this.exercise_idx === max_exercise_idx)
+        && (this.plan.set[this.set_idx].exercise[this.exercise_idx].done == 1)) {
+        this.workout_done = 1;
+    }
+
+    console.log(`handle_workout_done - ${this.workout_done}`);
+    console.log(`   compare: ${this.set_idx} === ${max_set_idx}`);
+    console.log(`   compare: ${this.set_repeat_idx} === ${max_set_idx}`);
+    console.log(`   compare: ${this.exercise_idx} === ${max_exercise_idx}`);
 }
 
 // ----------
 handle_key_press(app, ev) {
-    if (this.workout_done) {
+    if (app.workout_done) {
         return;
     }
 
@@ -246,6 +395,7 @@ handle_key_press(app, ev) {
     }
 
     app.update_debug_info();
+    app.update_active_item();
 }
 
 // ----------