diff --git a/rowers/templates/workout_form.html b/rowers/templates/workout_form.html
index 1c085c73..356a245a 100644
--- a/rowers/templates/workout_form.html
+++ b/rowers/templates/workout_form.html
@@ -69,7 +69,16 @@
             {{ form.as_table }}
         </table>
         {% csrf_token %}
-   <div id="formbutton" class="grid_1 prefix_4 suffix_1">
+        <div class="grid_2 prefix_2 alpha tooltip">
+          {% if workout.privacy == 'visible' %}
+          <a class="button blue small" href="/rowers/workout/{{ workout.id }}/setprivate">Set Private</a>
+          <span class="tooltiptext">Only you can see this workout</span>
+          {% else %}
+          <a class="button blue small" href="/rowers/workout/{{ workout.id }}/makepublic">Make Public</a>
+          <span class="tooltiptext">Make this workout visible to your teams and followers</span>
+          {% endif %}
+          </div>
+   <div id="formbutton" class="grid_1 suffix_1 omega">
         <input class="button green" type="submit" value="Save">
    </div>
     </form>
diff --git a/rowers/urls.py b/rowers/urls.py
index 8b4a1137..37ec074b 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -157,6 +157,8 @@ urlpatterns = [
     url(r'^workout/(?P<id>\d+)/edit/c/(?P<message>.+.*)$',views.workout_edit_view),
     url(r'^workout/(?P<id>\d+)/edit/s/(?P<successmessage>.+.*)$',views.workout_edit_view),
     url(r'^workout/(?P<id>\d+)/edit$',views.workout_edit_view),
+    url(r'^workout/(?P<id>\d+)/setprivate$',views.workout_setprivate_view),
+    url(r'^workout/(?P<id>\d+)/makepublic$',views.workout_makepublic_view),
     url(r'^workout/(?P<id>\d+)/advanced/c/(?P<message>.+.*)$',views.workout_advanced_view),
     url(r'^workout/(?P<id>\d+)/advanced/s/(?P<successmessage>.+.*)$',views.workout_advanced_view),
     url(r'^workout/(?P<id>\d+)/geeky$',views.workout_geeky_view),
diff --git a/rowers/views.py b/rowers/views.py
index ed51a361..88d9fa30 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -1884,7 +1884,71 @@ def workout_recalcsummary_view(request,id=0):
 		  })
     
     return HttpResponseRedirect(url)
+
+@login_required()
+def workout_makepublic_view(request,id,
+                            message='',
+                            successmessage=''):
+    try:    
+        row = Workout.objects.get(id=id)
+    except Workout.DoesNotExist:
+        raise Http404("Workout doesn't exist")
     
+    if (checkworkoutuser(request.user,row)==False):
+        message = "You are not allowed to edit this workout"
+        url = reverse(workouts_view,args=[str(message)])
+
+        return HttpResponseRedirect(url)
+
+    row.privacy = 'visible'
+    row.save()
+    rr = Rower.objects.get(user=request.user)
+    
+    teams = rr.team.all()
+    for team in teams:
+        row.team.add(team)
+        
+
+    message = "Workout set to public. Your followers and team members will see it"
+
+    url = reverse(workout_edit_view,
+		  kwargs = {
+		      'id':str(id),
+		      'successmessage':str(message),
+		  })
+    return HttpResponseRedirect(url)
+
+@login_required()
+def workout_setprivate_view(request,id,
+                            message='',
+                            successmessage=''):
+    try:    
+        row = Workout.objects.get(id=id)
+    except Workout.DoesNotExist:
+        raise Http404("Workout doesn't exist")
+    
+    if (checkworkoutuser(request.user,row)==False):
+        message = "You are not allowed to edit this workout"
+        url = reverse(workouts_view,args=[str(message)])
+
+        return HttpResponseRedirect(url)
+
+    row.privacy = 'private'
+    row.save()
+
+    for team in row.team.all():
+        row.team.remove(team)
+
+    message = "Workout set to private. Only you will see it"
+
+    url = reverse(workout_edit_view,
+		  kwargs = {
+		      'id':str(id),
+		      'successmessage':str(message),
+		  })
+    return HttpResponseRedirect(url)
+
+
 # List Workouts    
 @login_required()
 def workouts_view(request,message='',successmessage='',