diff --git a/exercises.py b/exercises.py
index 787c9f4..f5e1932 100644
--- a/exercises.py
+++ b/exercises.py
@@ -7,67 +7,87 @@ class Chest(object):
     barbell = ["Barbell Chest Press", "Inclined Barbell Chest Press", "Declined Barbell Chest Press"]
     cable = ["Cable Crossovers"]
     calisthenics = ["Push Ups", "Inclined Push Ups", "Stability Ball Pushups", "Medicine Ball Push Ups"]
+    free_weights = []
+    warm_up = []
+    cool_down = []
 
 class Back(object):
     exercises = []
-    selectorized = []
+    selectorized = ["Seated Lat Pull-Down"]
     dumbbell = ["Dumbbell Bent-Over Row",]
     barbell = ["Barbell Bent-Over Row",]
     cable = ["Seated Cable Row", "Seated Cable Lat-Pulldown"]
-    calisthenics = ["Pull Ups",]
+    calisthenics = ["Pull Ups", "Roman Chair Extensions"]
+    free_weights = []
+    warm_up = []
+    cool_down = []
 
 class Legs(object):
     exercises = []
-    selectorized = ["Leg Press", "Quadriceps Extensions", "Hamstring Curls"]
-    dumbbell = []
-    barbell = ["Barbell Deadlifts",]
+    selectorized = ["Quadriceps Extensions", "Hamstring Curls"]
+    dumbbell = ["Dumbbell Squats", "Single Leg Dumbbell Squats", "Dumbbell Deadlifts", "Single Leg Dumbbell Deadlifts"]
+    barbell = ["Barbell Deadlifts", "Barbell Squats"]
     cable = []
     calisthenics = ["Squats"]
+    free_weights = ["Leg Press", ]
+    warm_up = []
+    cool_down = []
 
 class Lower_Legs(object):
     exercises = []
-    selectorized = ["Smith Press Calf Raises", "Leg Press Calf Raises"]
+    selectorized = ["Leg Press Calf Extensions"]
     dumbbell = ["Dumbbell Calf Raises", ]
-    barbell = []
+    barbell = ["Smith Press Calf Raises", ]
     cable = []
     calisthenics = []
+    free_weights = []
 
 class Biceps(object):
-    exercises = ["Dumbbell Preacher Curls", "Dumbbell Hammer Curls", "Barbell Preacher Curls", "Cable Hammer Curls", "Cable Preacher Curls"]
-    selectorized = []
-    dumbbell = []
-    barbell = []
-    cable = []
+    exercises = []
+    selectorized = ["Seated Preacher Curls", "Seated Hammer Curls"]
+    dumbbell = ["Dumbbell Preacher Curls", "Dumbbell Hammer Curls", ]
+    barbell = ["Barbell Preacher Curls", ]
+    cable = ["Cable Hammer Curls", "Cable Preacher Curls"]
     calisthenics = []
+    free_weights = []
 
 class Triceps(object):
-    exercises = ["Overhead Dumbbell Triceps Extensions", "Overhead Cable Triceps Extensions", "Narrow-Grip Barbell Bench Press", "Narrow-Grip Dumbbell Bench Press", "Weighted Dips", "Cable Triceps Pull-Down"]
-    selectorized = []
-    dumbbell = []
-    barbell = []
-    cable = []
-    calisthenics = []
+    exercises = []
+    selectorized = ["Seated Triceps Extension"]
+    dumbbell = ["Overhead Dumbbell Triceps Extensions", "Narrow-Grip Dumbbell Bench Press", ]
+    barbell = ["Narrow-Grip Barbell Bench Press", ]
+    cable = ["Overhead Cable Triceps Extensions", "Cable Triceps Pull-Down"]
+    calisthenics = ["Weighted Dips", ]
+    free_weights = []
 
 class Shoulders(object):
-    exercises = ["Dumbbell Lateral Flies", "Dumbbell Shoulder Press", "Barbell Shoulder Press", "Cable Reverse Crossover"]
+    exercises = []
     selectorized = []
-    dumbbell = []
-    barbell = []
-    cable = []
+    dumbbell = ["Dumbbell Lateral Flies", "Dumbbell Shoulder Press", ]
+    barbell = ["Barbell Shoulder Press", ]
+    cable = ["Cable Reverse Crossover"]
     calisthenics = []
+    free_weights = []
+    warm_up = []
+    cool_down = []
 
 class Forearms(object):
-    exercises = ["Barbell Wrist Flexion", "Barbell Wrist Extension", "Weighted String Flexion", "Weighted String Extension"]
+    exercises = ["Weighted String Flexion", "Weighted String Extension"]
     selectorized = []
     dumbbell = []
-    barbell = []
+    barbell = ["Barbell Wrist Flexion", "Barbell Wrist Extension", ]
     cable = []
     calisthenics = []
+    free_weights = []
 
 class Abs(object):
-    exercises = ["Crunches", "Dead Bugs", "Hanging Leg Lifts", "Windshield Wipers", "Planks", "Flutter Kicks"]
+    exercises = []
     selectorized = []
     dumbbell = []
     barbell = []
     cable = []
-    calisthenics = []
+    calisthenics = ["Crunches", "Dead Bugs", "Hanging Leg Lifts", "Windshield Wipers", "Planks", "Flutter Kicks"]
+    free_weights = []
+
+class Cardio(object):
+    exercises = []
diff --git a/workoutgenerator.py b/workoutgenerator.py
index 0b61064..862e9e8 100755
--- a/workoutgenerator.py
+++ b/workoutgenerator.py
@@ -62,9 +62,14 @@ class Generator(object):
             pass
         else:
             print ("Sorry, please try inputting yes or no.")
+        return preference
     user_preference(Chest.selectorized, Back.selectorized, Legs.selectorized, Lower_Legs.selectorized, Biceps.selectorized, Triceps.selectorized, Shoulders.selectorized, Forearms.selectorized, Abs.selectorized, "selectorized equipment")
-    user_preference(Chest.dumbbell, Back.dumbbell, Legs.dumbbell, Lower_Legs.dumbbell, Biceps.dumbbell, Triceps.dumbbell, Shoulders.dumbbell, Forearms.dumbbell, Abs.dumbbell, "dumbbell")
-    user_preference(Chest.barbell, Back.barbell, Legs.barbell, Lower_Legs.barbell, Biceps.barbell, Triceps.barbell, Shoulders.barbell, Forearms.barbell, Abs.barbell, "barbell")
+    fwpref = user_preference(Chest.free_weights, Back.free_weights, Legs.free_weights, Lower_Legs.free_weights, Biceps.free_weights, Triceps.free_weights, Shoulders.free_weights, Forearms.free_weights, Abs.free_weights, "free weights")
+    if "y" in fwpref:
+        user_preference(Chest.dumbbell, Back.dumbbell, Legs.dumbbell, Lower_Legs.dumbbell, Biceps.dumbbell, Triceps.dumbbell, Shoulders.dumbbell, Forearms.dumbbell, Abs.dumbbell, "dumbbell")
+        user_preference(Chest.barbell, Back.barbell, Legs.barbell, Lower_Legs.barbell, Biceps.barbell, Triceps.barbell, Shoulders.barbell, Forearms.barbell, Abs.barbell, "barbell")
+    else:
+        pass
     user_preference(Chest.calisthenics, Back.calisthenics, Legs.calisthenics, Lower_Legs.calisthenics, Biceps.calisthenics, Triceps.calisthenics, Shoulders.calisthenics, Forearms.calisthenics, Abs.calisthenics, "calisthenics")
     user_preference(Chest.cable, Back.cable, Legs.cable, Lower_Legs.cable, Biceps.cable, Triceps.cable, Shoulders.cable, Forearms.cable, Abs.cable, "cable equipment")
     #If the user only wants to work out 1 day of the week, a full body workout will be generated.