diff --git a/Week1/APLOC2 Week 1/APLOC2 Week 1.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate b/Week1/APLOC2 Week 1/APLOC2 Week 1.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate
index 399ce11..f045294 100644
Binary files a/Week1/APLOC2 Week 1/APLOC2 Week 1.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate and b/Week1/APLOC2 Week 1/APLOC2 Week 1.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Week2/APLOCWeek2/APLOCWeek2.xcodeproj/project.pbxproj b/Week2/APLOCWeek2/APLOCWeek2.xcodeproj/project.pbxproj
index e282fec..a578086 100644
--- a/Week2/APLOCWeek2/APLOCWeek2.xcodeproj/project.pbxproj
+++ b/Week2/APLOCWeek2/APLOCWeek2.xcodeproj/project.pbxproj
@@ -21,6 +21,11 @@
 		65D407D016CD2D6F00FAE85B /* ViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65D407CE16CD2D6F00FAE85B /* ViewController_iPad.xib */; };
 		65D407D716CD4EF900FAE85B /* ViewController2.xib in Resources */ = {isa = PBXBuildFile; fileRef = 65D407D616CD4EF900FAE85B /* ViewController2.xib */; };
 		65D407DA16CD572700FAE85B /* ViewController2.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D407D916CD572700FAE85B /* ViewController2.m */; };
+		65D407DD16CDC19E00FAE85B /* baseEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D407DC16CDC19E00FAE85B /* baseEvent.m */; };
+		65D407E016CDC5F400FAE85B /* swimEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D407DF16CDC5F400FAE85B /* swimEvent.m */; };
+		65D407E316CDD16C00FAE85B /* bikeEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D407E216CDD16B00FAE85B /* bikeEvent.m */; };
+		65D407E616CDD3CE00FAE85B /* runEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D407E516CDD3CE00FAE85B /* runEvent.m */; };
+		65D407E916CDDA4300FAE85B /* eventFactory.m in Sources */ = {isa = PBXBuildFile; fileRef = 65D407E816CDDA4300FAE85B /* eventFactory.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -44,6 +49,16 @@
 		65D407D616CD4EF900FAE85B /* ViewController2.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ViewController2.xib; sourceTree = "<group>"; };
 		65D407D816CD572700FAE85B /* ViewController2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ViewController2.h; sourceTree = "<group>"; };
 		65D407D916CD572700FAE85B /* ViewController2.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController2.m; sourceTree = "<group>"; };
+		65D407DB16CDC19E00FAE85B /* baseEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = baseEvent.h; sourceTree = "<group>"; };
+		65D407DC16CDC19E00FAE85B /* baseEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = baseEvent.m; sourceTree = "<group>"; };
+		65D407DE16CDC5F400FAE85B /* swimEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swimEvent.h; sourceTree = "<group>"; };
+		65D407DF16CDC5F400FAE85B /* swimEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = swimEvent.m; sourceTree = "<group>"; };
+		65D407E116CDD16B00FAE85B /* bikeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bikeEvent.h; sourceTree = "<group>"; };
+		65D407E216CDD16B00FAE85B /* bikeEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = bikeEvent.m; sourceTree = "<group>"; };
+		65D407E416CDD3CE00FAE85B /* runEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = runEvent.h; sourceTree = "<group>"; };
+		65D407E516CDD3CE00FAE85B /* runEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = runEvent.m; sourceTree = "<group>"; };
+		65D407E716CDDA4300FAE85B /* eventFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eventFactory.h; sourceTree = "<group>"; };
+		65D407E816CDDA4300FAE85B /* eventFactory.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = eventFactory.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -100,6 +115,16 @@
 				65D407D616CD4EF900FAE85B /* ViewController2.xib */,
 				65D407D816CD572700FAE85B /* ViewController2.h */,
 				65D407D916CD572700FAE85B /* ViewController2.m */,
+				65D407DB16CDC19E00FAE85B /* baseEvent.h */,
+				65D407DC16CDC19E00FAE85B /* baseEvent.m */,
+				65D407DE16CDC5F400FAE85B /* swimEvent.h */,
+				65D407DF16CDC5F400FAE85B /* swimEvent.m */,
+				65D407E116CDD16B00FAE85B /* bikeEvent.h */,
+				65D407E216CDD16B00FAE85B /* bikeEvent.m */,
+				65D407E416CDD3CE00FAE85B /* runEvent.h */,
+				65D407E516CDD3CE00FAE85B /* runEvent.m */,
+				65D407E716CDDA4300FAE85B /* eventFactory.h */,
+				65D407E816CDDA4300FAE85B /* eventFactory.m */,
 			);
 			path = APLOCWeek2;
 			sourceTree = "<group>";
@@ -190,6 +215,11 @@
 				65D407C116CD2D6F00FAE85B /* AppDelegate.m in Sources */,
 				65D407CA16CD2D6F00FAE85B /* ViewController.m in Sources */,
 				65D407DA16CD572700FAE85B /* ViewController2.m in Sources */,
+				65D407DD16CDC19E00FAE85B /* baseEvent.m in Sources */,
+				65D407E016CDC5F400FAE85B /* swimEvent.m in Sources */,
+				65D407E316CDD16C00FAE85B /* bikeEvent.m in Sources */,
+				65D407E616CDD3CE00FAE85B /* runEvent.m in Sources */,
+				65D407E916CDDA4300FAE85B /* eventFactory.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Week2/APLOCWeek2/APLOCWeek2.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate b/Week2/APLOCWeek2/APLOCWeek2.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate
index a5b741f..dceb159 100644
Binary files a/Week2/APLOCWeek2/APLOCWeek2.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate and b/Week2/APLOCWeek2/APLOCWeek2.xcodeproj/project.xcworkspace/xcuserdata/notmyemail.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Week2/APLOCWeek2/APLOCWeek2/ViewController.h b/Week2/APLOCWeek2/APLOCWeek2/ViewController.h
index 8530307..5821857 100644
--- a/Week2/APLOCWeek2/APLOCWeek2/ViewController.h
+++ b/Week2/APLOCWeek2/APLOCWeek2/ViewController.h
@@ -7,15 +7,16 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "eventFactory.h"
 
 @interface ViewController : UIViewController
 {
     IBOutlet UISegmentedControl *segmentControl;
     IBOutlet UIStepper *stepperControl;
-    IBOutlet UIButton *cricketButton;
-    IBOutlet UIButton *butterflyButton;
-    IBOutlet UIButton *antButton;
-    IBOutlet UIButton *executeButton;
+    IBOutlet UIButton *swimButton;
+    IBOutlet UIButton *bikeButton;
+    IBOutlet UIButton *runButton;
+    IBOutlet UIButton *competeButton;
     IBOutlet UITextField *textBox;
 }
 
@@ -27,4 +28,6 @@
 
 -(IBAction)onClassButtonClick:(id)sender;
 
+-(IBAction)onCompeteClick:(id)sender;
+
 @end
diff --git a/Week2/APLOCWeek2/APLOCWeek2/ViewController.m b/Week2/APLOCWeek2/APLOCWeek2/ViewController.m
index b17092e..d3c74f1 100644
--- a/Week2/APLOCWeek2/APLOCWeek2/ViewController.m
+++ b/Week2/APLOCWeek2/APLOCWeek2/ViewController.m
@@ -15,35 +15,47 @@
 
 @implementation ViewController
 
+-(IBAction)onCompeteClick:(id)sender
+{
+    swimEvent *newSwimEvent = (swimEvent*)[eventFactory createNewEvent:SWIM];
+    [newSwimEvent setWaterTemp: 70];
+    
+    textBox.text = [NSString stringWithFormat:@"Event Time of %.2f Minutes", [newSwimEvent calculateEventTime]];
+}
+
+
 -(IBAction)onClassButtonClick:(id)sender
 {
     UIButton *classButton = (UIButton*)sender;
     if (classButton.tag == 0)
     {
-        textBox.text = @"Cricket";
+        textBox.text = @"Swim 1 mile";
         stepperControl.enabled = TRUE;
+        stepperControl.maximumValue = 3;
         classButton.enabled = FALSE;
-        antButton.enabled = TRUE;
-        butterflyButton.enabled = TRUE;
+        runButton.enabled = TRUE;
+        bikeButton.enabled = TRUE;
         stepperControl.value = 0;
     }
     else if (classButton.tag == 1)
     {
-        textBox.text = @"Butterfly";
+        textBox.text = @"Bike 1 mile";
         stepperControl.enabled = TRUE;
+        stepperControl.maximumValue = 120;
         classButton.enabled = FALSE;
-        antButton.enabled = TRUE;
-        cricketButton.enabled = TRUE;
+        runButton.enabled = TRUE;
+        swimButton.enabled = TRUE;
         stepperControl.value = 0;
         
     }
     else if (classButton.tag == 2)
     {
-        textBox.text = @"Ant";
+        textBox.text = @"Run 1 mile";
         stepperControl.enabled = TRUE;
+        stepperControl.maximumValue = 26;
         classButton.enabled = FALSE;
-        cricketButton.enabled = TRUE;
-        butterflyButton.enabled = TRUE;
+        swimButton.enabled = TRUE;
+        bikeButton.enabled = TRUE;
         stepperControl.value = 0;
         
     }
@@ -58,28 +70,28 @@
         
         if (currentValue == 1)
         {
-            if (cricketButton.enabled == FALSE)
+            if (swimButton.enabled == FALSE)
             {
-                textBox.text = @"Cricket";
+                textBox.text = @"Swim 1 mile";
             }
-            else if (butterflyButton.enabled == FALSE)
+            else if (bikeButton.enabled == FALSE)
             {
-                textBox.text = @"Butterfly";
+                textBox.text = @"Bike 1 mile";
             }
-            else textBox.text = @"Ant";
+            else textBox.text = @"Run 1 mile";
         }
         
         else
         {
-            if (cricketButton.enabled == FALSE)
+            if (swimButton.enabled == FALSE)
             {
-                textBox.text = [NSString stringWithFormat:@"%d Crickets", currentValue];
+                textBox.text = [NSString stringWithFormat:@"Swim %d miles", currentValue];
             }
-            else if (butterflyButton.enabled == FALSE)
+            else if (bikeButton.enabled == FALSE)
             {
-                textBox.text = [NSString stringWithFormat:@"%d Butterflies", currentValue];
+                textBox.text = [NSString stringWithFormat:@"Bike %d miles", currentValue];
             }
-            else textBox.text = [NSString stringWithFormat:@"%d Ants", currentValue];
+            else textBox.text = [NSString stringWithFormat:@"Run %d miles", currentValue];
         }
         
     }
diff --git a/Week2/APLOCWeek2/APLOCWeek2/baseEvent.h b/Week2/APLOCWeek2/APLOCWeek2/baseEvent.h
new file mode 100644
index 0000000..eb6b1eb
--- /dev/null
+++ b/Week2/APLOCWeek2/APLOCWeek2/baseEvent.h
@@ -0,0 +1,35 @@
+//
+//  baseEvent.h
+//  APLOCWeek2
+//
+//  Created by Brent Marohnic on 2/14/13.
+//  Copyright (c) 2013 Brent Marohnic. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface baseEvent : NSObject
+{
+    int eventEnum;
+}
+
+typedef enum
+{
+    SWIM,
+    BIKE,
+    RUN
+} eventEnum;
+
+// common data members for all events
+
+@property NSString *eventName;
+@property int eventDistance;
+@property int eventTimeInMinutes;
+
+// initialize
+-(id)init;
+
+// calculate event time
+-(float)calculateEventTime;
+
+@end
diff --git a/Week2/APLOCWeek2/APLOCWeek2/baseEvent.m b/Week2/APLOCWeek2/APLOCWeek2/baseEvent.m
new file mode 100644
index 0000000..84481c9
--- /dev/null
+++ b/Week2/APLOCWeek2/APLOCWeek2/baseEvent.m
@@ -0,0 +1,36 @@
+//
+//  baseEvent.m
+//  APLOCWeek2
+//
+//  Created by Brent Marohnic on 2/14/13.
+//  Copyright (c) 2013 Brent Marohnic. All rights reserved.
+//
+
+#import "baseEvent.h"
+
+@implementation baseEvent
+
+// allow the compiler to automatically genenate get and set methods for the event properties
+@synthesize eventDistance, eventName, eventTimeInMinutes;
+
+// initilize the base event
+-(id)init
+{
+    self = [super init];
+    if (self != nil)
+    {
+        [self setEventName: nil];
+        [self setEventDistance: 0];
+        [self setEventTimeInMinutes:0];
+    }
+    return self;
+}
+
+// calculate event time
+-(float)calculateEventTime
+{
+    NSLog(@"This will be overridden");
+    return 1.0;
+}
+
+@end
diff --git a/Week2/APLOCWeek2/APLOCWeek2/bikeEvent.h b/Week2/APLOCWeek2/APLOCWeek2/bikeEvent.h
new file mode 100644
index 0000000..374209c
--- /dev/null
+++ b/Week2/APLOCWeek2/APLOCWeek2/bikeEvent.h
@@ -0,0 +1,16 @@
+//
+//  bikeEvent.h
+//  APLOCWeek2
+//
+//  Created by Brent Marohnic on 2/14/13.
+//  Copyright (c) 2013 Brent Marohnic. All rights reserved.
+//
+
+#import "baseEvent.h"
+
+@interface bikeEvent : baseEvent
+
+// event specific data members used to calculate event time
+@property int elevationInFeet;
+
+@end
diff --git a/Week2/APLOCWeek2/APLOCWeek2/bikeEvent.m b/Week2/APLOCWeek2/APLOCWeek2/bikeEvent.m
new file mode 100644
index 0000000..30c1efc
--- /dev/null
+++ b/Week2/APLOCWeek2/APLOCWeek2/bikeEvent.m
@@ -0,0 +1,47 @@
+//
+//  bikeEvent.m
+//  APLOCWeek2
+//
+//  Created by Brent Marohnic on 2/14/13.
+//  Copyright (c) 2013 Brent Marohnic. All rights reserved.
+//
+
+#import "bikeEvent.h"
+
+@implementation bikeEvent
+
+@synthesize elevationInFeet, eventDistance, eventName;
+
+// set unique data members from within INIT
+
+-(id)init
+{
+    self = [super init];
+    if (self != nil)
+    {
+        [self setElevationInFeet:5500];
+        [self setEventDistance:120];
+        [self setEventName:@"Biking"];
+    }
+    return self;
+}
+
+// override the base event method
+// handicap equals the (absolute value of (optimum elevation - current elevation) * 0.01) * (absolute value of (optimum elevation - current elevation)
+// distanceHandicap equals the best training time for one mile * (distance * 1.05)
+
+-(float)calculateEventTime
+{
+    float handicap;
+    float distanceHandicap;
+    
+    handicap = abs(25 - elevationInFeet) * 0.01 * abs(25 - elevationInFeet);
+    distanceHandicap = 2 * (eventDistance * 1.05);
+    
+    [self setEventTimeInMinutes:(handicap + distanceHandicap)];
+    
+    return self.eventTimeInMinutes;
+}
+
+
+@end
diff --git a/Week2/APLOCWeek2/APLOCWeek2/en.lproj/ViewController_iPhone.xib b/Week2/APLOCWeek2/APLOCWeek2/en.lproj/ViewController_iPhone.xib
index 8b5280f..0958a9e 100644
--- a/Week2/APLOCWeek2/APLOCWeek2/en.lproj/ViewController_iPhone.xib
+++ b/Week2/APLOCWeek2/APLOCWeek2/en.lproj/ViewController_iPhone.xib
@@ -39,12 +39,13 @@
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
 				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUISegmentedControl" id="815579460">
+					<object class="IBUISegmentedControl" id="229361293">
 						<reference key="NSNextResponder" ref="774585933"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{0, 519}, {320, 30}}</string>
 						<reference key="NSSuperview" ref="774585933"/>
 						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -76,13 +77,13 @@
 							<reference ref="4"/>
 						</array>
 					</object>
-					<object class="IBUIButton" id="618487936">
+					<object class="IBUIButton" id="539929493">
 						<reference key="NSNextResponder" ref="774585933"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{247, 0}, {73, 33}}</string>
 						<reference key="NSSuperview" ref="774585933"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="314599686"/>
+						<reference key="NSNextKeyView" ref="391605918"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -90,7 +91,7 @@
 						<int key="IBUIContentVerticalAlignment">0</int>
 						<int key="IBUIButtonType">1</int>
 						<string key="IBUINormalTitle">Info</string>
-						<object class="NSColor" key="IBUIHighlightedTitleColor" id="187499954">
+						<object class="NSColor" key="IBUIHighlightedTitleColor" id="100318578">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
 						</object>
@@ -98,27 +99,27 @@
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 						</object>
-						<object class="NSColor" key="IBUINormalTitleShadowColor" id="309139851">
+						<object class="NSColor" key="IBUINormalTitleShadowColor" id="548140107">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MC41AA</bytes>
 						</object>
-						<object class="IBUIFontDescription" key="IBUIFontDescription" id="673253972">
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="818356741">
 							<int key="type">2</int>
 							<double key="pointSize">15</double>
 						</object>
-						<object class="NSFont" key="IBUIFont" id="763109743">
+						<object class="NSFont" key="IBUIFont" id="84232903">
 							<string key="NSName">Helvetica-Bold</string>
 							<double key="NSSize">15</double>
 							<int key="NSfFlags">16</int>
 						</object>
 					</object>
-					<object class="IBUITextField" id="537286050">
+					<object class="IBUITextField" id="749669702">
 						<reference key="NSNextResponder" ref="774585933"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{122, 80}, {178, 30}}</string>
+						<string key="NSFrame">{{20, 80}, {280, 30}}</string>
 						<reference key="NSSuperview" ref="774585933"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="825857776"/>
+						<reference key="NSNextKeyView" ref="636197312"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -127,11 +128,11 @@
 						<int key="IBUIContentVerticalAlignment">0</int>
 						<string key="IBUIText"/>
 						<int key="IBUIBorderStyle">3</int>
-						<string key="IBUIPlaceholder">Select Insect</string>
+						<string key="IBUIPlaceholder">Select Event</string>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MAA</bytes>
-							<object class="NSColorSpace" key="NSCustomColorSpace" id="729926522">
+							<object class="NSColorSpace" key="NSCustomColorSpace" id="717832138">
 								<int key="NSID">2</int>
 							</object>
 						</object>
@@ -150,13 +151,13 @@
 							<int key="NSfFlags">16</int>
 						</object>
 					</object>
-					<object class="IBUIStepper" id="314599686">
+					<object class="IBUIStepper" id="391605918">
 						<reference key="NSNextResponder" ref="774585933"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{20, 82}, {94, 27}}</string>
+						<string key="NSFrame">{{109, 118}, {94, 27}}</string>
 						<reference key="NSSuperview" ref="774585933"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="537286050"/>
+						<reference key="NSNextKeyView" ref="749669702"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
@@ -169,36 +170,36 @@
 						<double key="IBUIMinimumValue">1</double>
 						<double key="IBUIMaximumValue">10</double>
 					</object>
-					<object class="IBUIButton" id="825857776">
+					<object class="IBUIButton" id="636197312">
 						<reference key="NSNextResponder" ref="774585933"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 164}, {86, 44}}</string>
 						<reference key="NSSuperview" ref="774585933"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="536295908"/>
+						<reference key="NSNextKeyView" ref="1053400538"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
 						<int key="IBUIContentVerticalAlignment">0</int>
 						<int key="IBUIButtonType">1</int>
-						<string key="IBUINormalTitle">Cricket</string>
-						<reference key="IBUIHighlightedTitleColor" ref="187499954"/>
+						<string key="IBUINormalTitle">Swim</string>
+						<reference key="IBUIHighlightedTitleColor" ref="100318578"/>
 						<object class="NSColor" key="IBUINormalTitleColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="309139851"/>
-						<reference key="IBUIFontDescription" ref="673253972"/>
-						<reference key="IBUIFont" ref="763109743"/>
+						<reference key="IBUINormalTitleShadowColor" ref="548140107"/>
+						<reference key="IBUIFontDescription" ref="818356741"/>
+						<reference key="IBUIFont" ref="84232903"/>
 					</object>
-					<object class="IBUIButton" id="690917846">
+					<object class="IBUIButton" id="664253443">
 						<reference key="NSNextResponder" ref="774585933"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{208, 164}, {86, 44}}</string>
+						<string key="NSFrame">{{207, 164}, {85, 44}}</string>
 						<reference key="NSSuperview" ref="774585933"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="222818038"/>
+						<reference key="NSNextKeyView" ref="211258317"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<int key="IBUITag">2</int>
@@ -206,23 +207,23 @@
 						<int key="IBUIContentHorizontalAlignment">0</int>
 						<int key="IBUIContentVerticalAlignment">0</int>
 						<int key="IBUIButtonType">1</int>
-						<string key="IBUINormalTitle">Ant</string>
-						<reference key="IBUIHighlightedTitleColor" ref="187499954"/>
+						<string key="IBUINormalTitle">Run</string>
+						<reference key="IBUIHighlightedTitleColor" ref="100318578"/>
 						<object class="NSColor" key="IBUINormalTitleColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="309139851"/>
-						<reference key="IBUIFontDescription" ref="673253972"/>
-						<reference key="IBUIFont" ref="763109743"/>
+						<reference key="IBUINormalTitleShadowColor" ref="548140107"/>
+						<reference key="IBUIFontDescription" ref="818356741"/>
+						<reference key="IBUIFont" ref="84232903"/>
 					</object>
-					<object class="IBUIButton" id="536295908">
+					<object class="IBUIButton" id="1053400538">
 						<reference key="NSNextResponder" ref="774585933"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{114, 164}, {86, 44}}</string>
+						<string key="NSFrame">{{114, 164}, {85, 44}}</string>
 						<reference key="NSSuperview" ref="774585933"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="690917846"/>
+						<reference key="NSNextKeyView" ref="664253443"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<int key="IBUITag">1</int>
@@ -230,47 +231,47 @@
 						<int key="IBUIContentHorizontalAlignment">0</int>
 						<int key="IBUIContentVerticalAlignment">0</int>
 						<int key="IBUIButtonType">1</int>
-						<string key="IBUINormalTitle">Butterfly</string>
-						<reference key="IBUIHighlightedTitleColor" ref="187499954"/>
+						<string key="IBUINormalTitle">Bike</string>
+						<reference key="IBUIHighlightedTitleColor" ref="100318578"/>
 						<object class="NSColor" key="IBUINormalTitleColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="309139851"/>
-						<reference key="IBUIFontDescription" ref="673253972"/>
-						<reference key="IBUIFont" ref="763109743"/>
+						<reference key="IBUINormalTitleShadowColor" ref="548140107"/>
+						<reference key="IBUIFontDescription" ref="818356741"/>
+						<reference key="IBUIFont" ref="84232903"/>
 					</object>
-					<object class="IBUIButton" id="222818038">
+					<object class="IBUIButton" id="211258317">
 						<reference key="NSNextResponder" ref="774585933"/>
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{20, 416}, {280, 44}}</string>
 						<reference key="NSSuperview" ref="774585933"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="815579460"/>
+						<reference key="NSNextKeyView" ref="229361293"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
 						<int key="IBUIContentVerticalAlignment">0</int>
 						<int key="IBUIButtonType">1</int>
-						<string key="IBUINormalTitle">Execute</string>
-						<reference key="IBUIHighlightedTitleColor" ref="187499954"/>
+						<string key="IBUINormalTitle">Compete</string>
+						<reference key="IBUIHighlightedTitleColor" ref="100318578"/>
 						<object class="NSColor" key="IBUINormalTitleColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 						</object>
-						<reference key="IBUIFontDescription" ref="673253972"/>
-						<reference key="IBUIFont" ref="763109743"/>
+						<reference key="IBUIFontDescription" ref="818356741"/>
+						<reference key="IBUIFont" ref="84232903"/>
 					</object>
 				</array>
 				<string key="NSFrame">{{0, 20}, {320, 548}}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="618487936"/>
+				<reference key="NSNextKeyView" ref="539929493"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MC43NQA</bytes>
-					<reference key="NSCustomColorSpace" ref="729926522"/>
+					<reference key="NSCustomColorSpace" ref="717832138"/>
 				</object>
 				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
@@ -308,7 +309,7 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">segmentControl</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="815579460"/>
+						<reference key="destination" ref="229361293"/>
 					</object>
 					<int key="connectionID">15</int>
 				</object>
@@ -316,54 +317,54 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">stepperControl</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="314599686"/>
+						<reference key="destination" ref="391605918"/>
 					</object>
 					<int key="connectionID">85</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">antButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="690917846"/>
-					</object>
-					<int key="connectionID">86</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">butterflyButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="536295908"/>
-					</object>
-					<int key="connectionID">87</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">cricketButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="825857776"/>
-					</object>
-					<int key="connectionID">88</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">executeButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="222818038"/>
-					</object>
-					<int key="connectionID">89</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">textBox</string>
 						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="537286050"/>
+						<reference key="destination" ref="749669702"/>
 					</object>
 					<int key="connectionID">93</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">swimButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="636197312"/>
+					</object>
+					<int key="connectionID">105</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">runButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="664253443"/>
+					</object>
+					<int key="connectionID">106</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">bikeButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="1053400538"/>
+					</object>
+					<int key="connectionID">107</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">competeButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="211258317"/>
+					</object>
+					<int key="connectionID">108</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onChange:</string>
-						<reference key="source" ref="815579460"/>
+						<reference key="source" ref="229361293"/>
 						<reference key="destination" ref="372490531"/>
 						<int key="IBEventType">13</int>
 					</object>
@@ -372,7 +373,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onClick:</string>
-						<reference key="source" ref="618487936"/>
+						<reference key="source" ref="539929493"/>
 						<reference key="destination" ref="372490531"/>
 						<int key="IBEventType">7</int>
 					</object>
@@ -381,7 +382,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onStepChange:</string>
-						<reference key="source" ref="314599686"/>
+						<reference key="source" ref="391605918"/>
 						<reference key="destination" ref="372490531"/>
 						<int key="IBEventType">13</int>
 					</object>
@@ -390,7 +391,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onClassButtonClick:</string>
-						<reference key="source" ref="825857776"/>
+						<reference key="source" ref="636197312"/>
 						<reference key="destination" ref="372490531"/>
 						<int key="IBEventType">7</int>
 					</object>
@@ -399,7 +400,7 @@
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onClassButtonClick:</string>
-						<reference key="source" ref="690917846"/>
+						<reference key="source" ref="664253443"/>
 						<reference key="destination" ref="372490531"/>
 						<int key="IBEventType">7</int>
 					</object>
@@ -408,12 +409,21 @@
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">onClassButtonClick:</string>
-						<reference key="source" ref="536295908"/>
+						<reference key="source" ref="1053400538"/>
 						<reference key="destination" ref="372490531"/>
 						<int key="IBEventType">7</int>
 					</object>
 					<int key="connectionID">91</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchEventConnection" key="connection">
+						<string key="label">onCompeteClick:</string>
+						<reference key="source" ref="211258317"/>
+						<reference key="destination" ref="372490531"/>
+						<int key="IBEventType">7</int>
+					</object>
+					<int key="connectionID">109</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -438,8 +448,8 @@
 						<int key="objectID">6</int>
 						<reference key="object" ref="774585933"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="762209843">
-								<reference key="firstItem" ref="815579460"/>
+							<object class="IBNSLayoutConstraint" id="669832691">
+								<reference key="firstItem" ref="229361293"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="774585933"/>
@@ -454,8 +464,8 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="1050840766">
-								<reference key="firstItem" ref="815579460"/>
+							<object class="IBNSLayoutConstraint" id="557470571">
+								<reference key="firstItem" ref="229361293"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="774585933"/>
@@ -470,8 +480,8 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="1034554831">
-								<reference key="firstItem" ref="815579460"/>
+							<object class="IBNSLayoutConstraint" id="900053525">
+								<reference key="firstItem" ref="229361293"/>
 								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="774585933"/>
@@ -486,8 +496,8 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="370052035">
-								<reference key="firstItem" ref="222818038"/>
+							<object class="IBNSLayoutConstraint" id="832749604">
+								<reference key="firstItem" ref="211258317"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="774585933"/>
@@ -502,11 +512,11 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="457585243">
+							<object class="IBNSLayoutConstraint" id="279297660">
 								<reference key="firstItem" ref="774585933"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="222818038"/>
+								<reference key="secondItem" ref="211258317"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -518,11 +528,11 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="130468659">
+							<object class="IBNSLayoutConstraint" id="663611857">
 								<reference key="firstItem" ref="774585933"/>
 								<int key="firstAttribute">4</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="222818038"/>
+								<reference key="secondItem" ref="211258317"/>
 								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
@@ -534,11 +544,11 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="1016712528">
-								<reference key="firstItem" ref="690917846"/>
+							<object class="IBNSLayoutConstraint" id="1055216775">
+								<reference key="firstItem" ref="664253443"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="536295908"/>
+								<reference key="secondItem" ref="1053400538"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -550,11 +560,11 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="907499949">
-								<reference key="firstItem" ref="690917846"/>
+							<object class="IBNSLayoutConstraint" id="71844885">
+								<reference key="firstItem" ref="664253443"/>
 								<int key="firstAttribute">11</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="536295908"/>
+								<reference key="secondItem" ref="1053400538"/>
 								<int key="secondAttribute">11</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
@@ -566,8 +576,8 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="787602216">
-								<reference key="firstItem" ref="618487936"/>
+							<object class="IBNSLayoutConstraint" id="875015383">
+								<reference key="firstItem" ref="539929493"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="774585933"/>
@@ -582,8 +592,8 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="64819597">
-								<reference key="firstItem" ref="618487936"/>
+							<object class="IBNSLayoutConstraint" id="25058211">
+								<reference key="firstItem" ref="539929493"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="774585933"/>
@@ -598,11 +608,27 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="766724095">
-								<reference key="firstItem" ref="536295908"/>
+							<object class="IBNSLayoutConstraint" id="1034873490">
+								<reference key="firstItem" ref="1053400538"/>
+								<int key="firstAttribute">9</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="391605918"/>
+								<int key="secondAttribute">9</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">0.0</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="774585933"/>
+								<int key="scoringType">6</int>
+								<float key="scoringTypeFloat">24</float>
+								<int key="contentType">2</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="1031397534">
+								<reference key="firstItem" ref="1053400538"/>
 								<int key="firstAttribute">11</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="825857776"/>
+								<reference key="secondItem" ref="636197312"/>
 								<int key="secondAttribute">11</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
@@ -614,11 +640,11 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">2</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="592901263">
-								<reference key="firstItem" ref="536295908"/>
+							<object class="IBNSLayoutConstraint" id="134104803">
+								<reference key="firstItem" ref="1053400538"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="825857776"/>
+								<reference key="secondItem" ref="636197312"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -630,8 +656,8 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="1004465472">
-								<reference key="firstItem" ref="825857776"/>
+							<object class="IBNSLayoutConstraint" id="87183201">
+								<reference key="firstItem" ref="636197312"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="774585933"/>
@@ -646,8 +672,8 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="275436947">
-								<reference key="firstItem" ref="825857776"/>
+							<object class="IBNSLayoutConstraint" id="35353971">
+								<reference key="firstItem" ref="636197312"/>
 								<int key="firstAttribute">5</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="774585933"/>
@@ -662,28 +688,12 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="836000996">
-								<reference key="firstItem" ref="537286050"/>
-								<int key="firstAttribute">10</int>
+							<object class="IBNSLayoutConstraint" id="694166604">
+								<reference key="firstItem" ref="391605918"/>
+								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="314599686"/>
-								<int key="secondAttribute">10</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">0.0</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="774585933"/>
-								<int key="scoringType">6</int>
-								<float key="scoringTypeFloat">24</float>
-								<int key="contentType">2</int>
-							</object>
-							<object class="IBNSLayoutConstraint" id="426272538">
-								<reference key="firstItem" ref="537286050"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="314599686"/>
-								<int key="secondAttribute">6</int>
+								<reference key="secondItem" ref="749669702"/>
+								<int key="secondAttribute">4</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
 									<double key="value">8</double>
@@ -694,8 +704,24 @@
 								<float key="scoringTypeFloat">24</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="51022414">
-								<reference key="firstItem" ref="537286050"/>
+							<object class="IBNSLayoutConstraint" id="42803844">
+								<reference key="firstItem" ref="749669702"/>
+								<int key="firstAttribute">5</int>
+								<int key="relation">0</int>
+								<reference key="secondItem" ref="774585933"/>
+								<int key="secondAttribute">5</int>
+								<float key="multiplier">1</float>
+								<object class="IBNSLayoutSymbolicConstant" key="constant">
+									<double key="value">20</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="774585933"/>
+								<int key="scoringType">8</int>
+								<float key="scoringTypeFloat">29</float>
+								<int key="contentType">3</int>
+							</object>
+							<object class="IBNSLayoutConstraint" id="866600580">
+								<reference key="firstItem" ref="749669702"/>
 								<int key="firstAttribute">3</int>
 								<int key="relation">0</int>
 								<reference key="secondItem" ref="774585933"/>
@@ -710,11 +736,11 @@
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="488577085">
+							<object class="IBNSLayoutConstraint" id="98132068">
 								<reference key="firstItem" ref="774585933"/>
 								<int key="firstAttribute">6</int>
 								<int key="relation">0</int>
-								<reference key="secondItem" ref="537286050"/>
+								<reference key="secondItem" ref="749669702"/>
 								<int key="secondAttribute">6</int>
 								<float key="multiplier">1</float>
 								<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -726,59 +752,43 @@
 								<float key="scoringTypeFloat">29</float>
 								<int key="contentType">3</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="825597353">
-								<reference key="firstItem" ref="314599686"/>
-								<int key="firstAttribute">5</int>
-								<int key="relation">0</int>
-								<reference key="secondItem" ref="774585933"/>
-								<int key="secondAttribute">5</int>
-								<float key="multiplier">1</float>
-								<object class="IBNSLayoutSymbolicConstant" key="constant">
-									<double key="value">20</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="774585933"/>
-								<int key="scoringType">8</int>
-								<float key="scoringTypeFloat">29</float>
-								<int key="contentType">3</int>
-							</object>
-							<reference ref="815579460"/>
-							<reference ref="618487936"/>
-							<reference ref="537286050"/>
-							<reference ref="314599686"/>
-							<reference ref="536295908"/>
-							<reference ref="690917846"/>
-							<reference ref="222818038"/>
-							<reference ref="825857776"/>
+							<reference ref="229361293"/>
+							<reference ref="539929493"/>
+							<reference ref="749669702"/>
+							<reference ref="1053400538"/>
+							<reference ref="211258317"/>
+							<reference ref="636197312"/>
+							<reference ref="664253443"/>
+							<reference ref="391605918"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">8</int>
-						<reference key="object" ref="815579460"/>
+						<reference key="object" ref="229361293"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">14</int>
-						<reference key="object" ref="762209843"/>
+						<reference key="object" ref="669832691"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">13</int>
-						<reference key="object" ref="1050840766"/>
+						<reference key="object" ref="557470571"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">11</int>
-						<reference key="object" ref="1034554831"/>
+						<reference key="object" ref="900053525"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">18</int>
-						<reference key="object" ref="618487936"/>
+						<reference key="object" ref="539929493"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="392115540">
-								<reference key="firstItem" ref="618487936"/>
+							<object class="IBNSLayoutConstraint" id="714514724">
+								<reference key="firstItem" ref="539929493"/>
 								<int key="firstAttribute">8</int>
 								<int key="relation">0</int>
 								<nil key="secondItem"/>
@@ -788,13 +798,13 @@
 									<double key="value">32</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="618487936"/>
+								<reference key="containingView" ref="539929493"/>
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">1</int>
 							</object>
-							<object class="IBNSLayoutConstraint" id="302330241">
-								<reference key="firstItem" ref="618487936"/>
+							<object class="IBNSLayoutConstraint" id="536742546">
+								<reference key="firstItem" ref="539929493"/>
 								<int key="firstAttribute">7</int>
 								<int key="relation">0</int>
 								<nil key="secondItem"/>
@@ -804,7 +814,7 @@
 									<double key="value">73</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="618487936"/>
+								<reference key="containingView" ref="539929493"/>
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">1</int>
@@ -814,89 +824,52 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">21</int>
-						<reference key="object" ref="64819597"/>
+						<reference key="object" ref="25058211"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">22</int>
-						<reference key="object" ref="787602216"/>
+						<reference key="object" ref="875015383"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">24</int>
-						<reference key="object" ref="302330241"/>
-						<reference key="parent" ref="618487936"/>
+						<reference key="object" ref="536742546"/>
+						<reference key="parent" ref="539929493"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">26</int>
-						<reference key="object" ref="392115540"/>
-						<reference key="parent" ref="618487936"/>
+						<reference key="object" ref="714514724"/>
+						<reference key="parent" ref="539929493"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">28</int>
-						<reference key="object" ref="537286050"/>
+						<reference key="object" ref="749669702"/>
 						<array class="NSMutableArray" key="children"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">36</int>
-						<reference key="object" ref="488577085"/>
+						<reference key="object" ref="98132068"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">37</int>
-						<reference key="object" ref="51022414"/>
+						<reference key="object" ref="866600580"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">38</int>
-						<reference key="object" ref="314599686"/>
-						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="249061247">
-								<reference key="firstItem" ref="314599686"/>
-								<int key="firstAttribute">7</int>
-								<int key="relation">0</int>
-								<nil key="secondItem"/>
-								<int key="secondAttribute">0</int>
-								<float key="multiplier">1</float>
-								<object class="IBLayoutConstant" key="constant">
-									<double key="value">94</double>
-								</object>
-								<float key="priority">1000</float>
-								<reference key="containingView" ref="314599686"/>
-								<int key="scoringType">3</int>
-								<float key="scoringTypeFloat">9</float>
-								<int key="contentType">1</int>
-							</object>
-						</array>
-						<reference key="parent" ref="774585933"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">42</int>
-						<reference key="object" ref="825597353"/>
-						<reference key="parent" ref="774585933"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">43</int>
-						<reference key="object" ref="426272538"/>
-						<reference key="parent" ref="774585933"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">44</int>
-						<reference key="object" ref="249061247"/>
-						<reference key="parent" ref="314599686"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">45</int>
-						<reference key="object" ref="836000996"/>
+						<reference key="object" ref="391605918"/>
+						<array class="NSMutableArray" key="children"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">46</int>
-						<reference key="object" ref="825857776"/>
+						<reference key="object" ref="636197312"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="994043016">
-								<reference key="firstItem" ref="825857776"/>
+							<object class="IBNSLayoutConstraint" id="892481681">
+								<reference key="firstItem" ref="636197312"/>
 								<int key="firstAttribute">7</int>
 								<int key="relation">0</int>
 								<nil key="secondItem"/>
@@ -906,7 +879,7 @@
 									<double key="value">86</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="825857776"/>
+								<reference key="containingView" ref="636197312"/>
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">1</int>
@@ -916,30 +889,30 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">49</int>
-						<reference key="object" ref="275436947"/>
+						<reference key="object" ref="35353971"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">50</int>
-						<reference key="object" ref="1004465472"/>
+						<reference key="object" ref="87183201"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">51</int>
-						<reference key="object" ref="690917846"/>
+						<reference key="object" ref="664253443"/>
 						<array class="NSMutableArray" key="children">
-							<object class="IBNSLayoutConstraint" id="190855752">
-								<reference key="firstItem" ref="690917846"/>
+							<object class="IBNSLayoutConstraint" id="568407560">
+								<reference key="firstItem" ref="664253443"/>
 								<int key="firstAttribute">7</int>
 								<int key="relation">0</int>
 								<nil key="secondItem"/>
 								<int key="secondAttribute">0</int>
 								<float key="multiplier">1</float>
 								<object class="IBLayoutConstant" key="constant">
-									<double key="value">86</double>
+									<double key="value">85</double>
 								</object>
 								<float key="priority">1000</float>
-								<reference key="containingView" ref="690917846"/>
+								<reference key="containingView" ref="664253443"/>
 								<int key="scoringType">3</int>
 								<float key="scoringTypeFloat">9</float>
 								<int key="contentType">1</int>
@@ -949,58 +922,96 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">54</int>
-						<reference key="object" ref="536295908"/>
+						<reference key="object" ref="1053400538"/>
+						<array class="NSMutableArray" key="children">
+							<object class="IBNSLayoutConstraint" id="593851023">
+								<reference key="firstItem" ref="1053400538"/>
+								<int key="firstAttribute">7</int>
+								<int key="relation">0</int>
+								<nil key="secondItem"/>
+								<int key="secondAttribute">0</int>
+								<float key="multiplier">1</float>
+								<object class="IBLayoutConstant" key="constant">
+									<double key="value">85</double>
+								</object>
+								<float key="priority">1000</float>
+								<reference key="containingView" ref="1053400538"/>
+								<int key="scoringType">3</int>
+								<float key="scoringTypeFloat">9</float>
+								<int key="contentType">1</int>
+							</object>
+						</array>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">65</int>
-						<reference key="object" ref="592901263"/>
+						<reference key="object" ref="134104803"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">69</int>
-						<reference key="object" ref="190855752"/>
-						<reference key="parent" ref="690917846"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">70</int>
-						<reference key="object" ref="994043016"/>
-						<reference key="parent" ref="825857776"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">72</int>
-						<reference key="object" ref="907499949"/>
-						<reference key="parent" ref="774585933"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">73</int>
-						<reference key="object" ref="1016712528"/>
+						<reference key="object" ref="71844885"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">74</int>
-						<reference key="object" ref="222818038"/>
+						<reference key="object" ref="211258317"/>
 						<array class="NSMutableArray" key="children"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">81</int>
-						<reference key="object" ref="457585243"/>
+						<reference key="object" ref="279297660"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">83</int>
-						<reference key="object" ref="370052035"/>
+						<reference key="object" ref="832749604"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">78</int>
-						<reference key="object" ref="130468659"/>
+						<reference key="object" ref="663611857"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">66</int>
-						<reference key="object" ref="766724095"/>
+						<reference key="object" ref="1031397534"/>
+						<reference key="parent" ref="774585933"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">100</int>
+						<reference key="object" ref="892481681"/>
+						<reference key="parent" ref="636197312"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">102</int>
+						<reference key="object" ref="1055216775"/>
+						<reference key="parent" ref="774585933"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">103</int>
+						<reference key="object" ref="593851023"/>
+						<reference key="parent" ref="1053400538"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">104</int>
+						<reference key="object" ref="568407560"/>
+						<reference key="parent" ref="664253443"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">110</int>
+						<reference key="object" ref="1034873490"/>
+						<reference key="parent" ref="774585933"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">111</int>
+						<reference key="object" ref="694166604"/>
+						<reference key="parent" ref="774585933"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">113</int>
+						<reference key="object" ref="42803844"/>
 						<reference key="parent" ref="774585933"/>
 					</object>
 				</array>
@@ -1010,13 +1021,20 @@
 				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="-2.CustomClassName">UIResponder</string>
 				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="100.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="102.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="103.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="104.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="110.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="111.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="113.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="13.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<array key="18.IBViewMetadataConstraints">
-					<reference ref="302330241"/>
-					<reference ref="392115540"/>
+					<reference ref="536742546"/>
+					<reference ref="714514724"/>
 				</array>
 				<boolean value="NO" key="18.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -1028,56 +1046,49 @@
 				<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="37.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<array key="38.IBViewMetadataConstraints">
-					<reference ref="249061247"/>
-				</array>
 				<boolean value="NO" key="38.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
-				<string key="42.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="43.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="44.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="45.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="46.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<array key="46.IBViewMetadataConstraints">
-					<reference ref="994043016"/>
+					<reference ref="892481681"/>
 				</array>
 				<boolean value="NO" key="46.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="49.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="50.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="51.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<array key="51.IBViewMetadataConstraints">
-					<reference ref="190855752"/>
+				<array class="NSMutableArray" key="51.IBViewMetadataConstraints">
+					<reference ref="568407560"/>
 				</array>
 				<boolean value="NO" key="51.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="54.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<array class="NSMutableArray" key="54.IBViewMetadataConstraints">
+					<reference ref="593851023"/>
+				</array>
 				<boolean value="NO" key="54.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<array key="6.IBViewMetadataConstraints">
-					<reference ref="825597353"/>
-					<reference ref="488577085"/>
-					<reference ref="51022414"/>
-					<reference ref="426272538"/>
-					<reference ref="836000996"/>
-					<reference ref="275436947"/>
-					<reference ref="1004465472"/>
-					<reference ref="592901263"/>
-					<reference ref="766724095"/>
-					<reference ref="64819597"/>
-					<reference ref="787602216"/>
-					<reference ref="907499949"/>
-					<reference ref="1016712528"/>
-					<reference ref="130468659"/>
-					<reference ref="457585243"/>
-					<reference ref="370052035"/>
-					<reference ref="1034554831"/>
-					<reference ref="1050840766"/>
-					<reference ref="762209843"/>
+					<reference ref="98132068"/>
+					<reference ref="866600580"/>
+					<reference ref="42803844"/>
+					<reference ref="694166604"/>
+					<reference ref="35353971"/>
+					<reference ref="87183201"/>
+					<reference ref="134104803"/>
+					<reference ref="1031397534"/>
+					<reference ref="1034873490"/>
+					<reference ref="25058211"/>
+					<reference ref="875015383"/>
+					<reference ref="71844885"/>
+					<reference ref="1055216775"/>
+					<reference ref="663611857"/>
+					<reference ref="279297660"/>
+					<reference ref="832749604"/>
+					<reference ref="900053525"/>
+					<reference ref="557470571"/>
+					<reference ref="669832691"/>
 				</array>
 				<string key="65.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="69.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="70.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<real value="0.0" key="74.IBUIButtonInspectorSelectedEdgeInsetMetadataKey"/>
 				<boolean value="NO" key="74.IBViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -1092,7 +1103,7 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">97</int>
+			<int key="maxID">113</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1111,6 +1122,7 @@
 						<string key="onChange:">id</string>
 						<string key="onClassButtonClick:">id</string>
 						<string key="onClick:">id</string>
+						<string key="onCompeteClick:">id</string>
 						<string key="onStepChange:">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="actionInfosByName">
@@ -1126,35 +1138,35 @@
 							<string key="name">onClick:</string>
 							<string key="candidateClassName">id</string>
 						</object>
+						<object class="IBActionInfo" key="onCompeteClick:">
+							<string key="name">onCompeteClick:</string>
+							<string key="candidateClassName">id</string>
+						</object>
 						<object class="IBActionInfo" key="onStepChange:">
 							<string key="name">onStepChange:</string>
 							<string key="candidateClassName">id</string>
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="antButton">UIButton</string>
-						<string key="butterflyButton">UIButton</string>
-						<string key="cricketButton">UIButton</string>
-						<string key="executeButton">UIButton</string>
+						<string key="bikeButton">UIButton</string>
+						<string key="competeButton">UIButton</string>
+						<string key="runButton">UIButton</string>
 						<string key="segmentControl">UISegmentedControl</string>
 						<string key="stepperControl">UIStepper</string>
+						<string key="swimButton">UIButton</string>
 						<string key="textBox">UITextField</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="antButton">
-							<string key="name">antButton</string>
+						<object class="IBToOneOutletInfo" key="bikeButton">
+							<string key="name">bikeButton</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="butterflyButton">
-							<string key="name">butterflyButton</string>
+						<object class="IBToOneOutletInfo" key="competeButton">
+							<string key="name">competeButton</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="cricketButton">
-							<string key="name">cricketButton</string>
-							<string key="candidateClassName">UIButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="executeButton">
-							<string key="name">executeButton</string>
+						<object class="IBToOneOutletInfo" key="runButton">
+							<string key="name">runButton</string>
 							<string key="candidateClassName">UIButton</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="segmentControl">
@@ -1165,6 +1177,10 @@
 							<string key="name">stepperControl</string>
 							<string key="candidateClassName">UIStepper</string>
 						</object>
+						<object class="IBToOneOutletInfo" key="swimButton">
+							<string key="name">swimButton</string>
+							<string key="candidateClassName">UIButton</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="textBox">
 							<string key="name">textBox</string>
 							<string key="candidateClassName">UITextField</string>
diff --git a/Week2/APLOCWeek2/APLOCWeek2/eventFactory.h b/Week2/APLOCWeek2/APLOCWeek2/eventFactory.h
new file mode 100644
index 0000000..9a13c95
--- /dev/null
+++ b/Week2/APLOCWeek2/APLOCWeek2/eventFactory.h
@@ -0,0 +1,19 @@
+//
+//  eventFactory.h
+//  APLOCWeek2
+//
+//  Created by Brent Marohnic on 2/14/13.
+//  Copyright (c) 2013 Brent Marohnic. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "baseEvent.h"
+#import "swimEvent.h"
+#import "bikeEvent.h"
+#import "runEvent.h"
+
+@interface eventFactory : NSObject
+
++(baseEvent *)createNewEvent:(int)eventType;
+
+@end
diff --git a/Week2/APLOCWeek2/APLOCWeek2/eventFactory.m b/Week2/APLOCWeek2/APLOCWeek2/eventFactory.m
new file mode 100644
index 0000000..58a9060
--- /dev/null
+++ b/Week2/APLOCWeek2/APLOCWeek2/eventFactory.m
@@ -0,0 +1,31 @@
+//
+//  eventFactory.m
+//  APLOCWeek2
+//
+//  Created by Brent Marohnic on 2/14/13.
+//  Copyright (c) 2013 Brent Marohnic. All rights reserved.
+//
+
+#import "eventFactory.h"
+
+
+@implementation eventFactory
+
++(baseEvent *)createNewEvent:(int)eventType
+{
+    if (eventType == SWIM)
+    {
+        return [[swimEvent alloc] init];
+    }
+    else if (eventType == BIKE)
+    {
+        return [[bikeEvent alloc] init];
+    }
+    else if (eventType == RUN)
+    {
+        return [[runEvent alloc] init];
+    }
+    else return nil;
+}
+
+@end
diff --git a/Week2/APLOCWeek2/APLOCWeek2/runEvent.h b/Week2/APLOCWeek2/APLOCWeek2/runEvent.h
new file mode 100644
index 0000000..7a139f5
--- /dev/null
+++ b/Week2/APLOCWeek2/APLOCWeek2/runEvent.h
@@ -0,0 +1,27 @@
+//
+//  runEvent.h
+//  APLOCWeek2
+//
+//  Created by Brent Marohnic on 2/14/13.
+//  Copyright (c) 2013 Brent Marohnic. All rights reserved.
+//
+
+#import "baseEvent.h"
+
+@interface runEvent : baseEvent
+{
+    int terrainEnum;
+}
+
+typedef enum
+{
+    PAVEDESTREETS,
+    MIXEDSURFACE,
+    CROSSCOUNTRY
+} terrainEnum;
+
+// event specific data members used to calculate event time
+
+@property int terrainType;
+
+@end
diff --git a/Week2/APLOCWeek2/APLOCWeek2/runEvent.m b/Week2/APLOCWeek2/APLOCWeek2/runEvent.m
new file mode 100644
index 0000000..434a565
--- /dev/null
+++ b/Week2/APLOCWeek2/APLOCWeek2/runEvent.m
@@ -0,0 +1,57 @@
+//
+//  runEvent.m
+//  APLOCWeek2
+//
+//  Created by Brent Marohnic on 2/14/13.
+//  Copyright (c) 2013 Brent Marohnic. All rights reserved.
+//
+
+#import "runEvent.h"
+
+@implementation runEvent
+
+@synthesize terrainType, eventDistance, eventName;
+
+// set unique data members from within INIT
+
+-(id)init
+{
+    self = [super init];
+    if (self != nil)
+    {
+        [self setTerrainType:terrainEnum];
+        [self setEventDistance:26];
+        [self setEventName:@"Running"];
+    }
+    return self;
+}
+
+// override the base event method
+// handicap equals a factor derived from the type of terrain on which the event occurs
+// distanceHandicap equals the best training time for one mile * (distance * 1.05)
+
+-(float)calculateEventTime
+{
+    float handicap;
+    float distanceHandicap;
+    
+    if (terrainType == PAVEDESTREETS)
+    {
+        handicap = PAVEDESTREETS;
+    }
+    else if (terrainType == MIXEDSURFACE)
+    {
+        handicap = MIXEDSURFACE * (MIXEDSURFACE * 0.1);
+    }
+    else handicap = CROSSCOUNTRY * (CROSSCOUNTRY * 0.1);
+    
+    
+    distanceHandicap = 8 * (eventDistance * 1.05);
+    
+    [self setEventTimeInMinutes:(handicap + distanceHandicap)];
+    
+    return self.eventTimeInMinutes;
+}
+
+
+@end
diff --git a/Week2/APLOCWeek2/APLOCWeek2/swimEvent.h b/Week2/APLOCWeek2/APLOCWeek2/swimEvent.h
new file mode 100644
index 0000000..7fe41f8
--- /dev/null
+++ b/Week2/APLOCWeek2/APLOCWeek2/swimEvent.h
@@ -0,0 +1,16 @@
+//
+//  swimEvent.h
+//  APLOCWeek2
+//
+//  Created by Brent Marohnic on 2/14/13.
+//  Copyright (c) 2013 Brent Marohnic. All rights reserved.
+//
+
+#import "baseEvent.h"
+
+@interface swimEvent : baseEvent
+
+// event specific data members used to calculate event time
+@property int waterTemp;
+
+@end
diff --git a/Week2/APLOCWeek2/APLOCWeek2/swimEvent.m b/Week2/APLOCWeek2/APLOCWeek2/swimEvent.m
new file mode 100644
index 0000000..de98b25
--- /dev/null
+++ b/Week2/APLOCWeek2/APLOCWeek2/swimEvent.m
@@ -0,0 +1,46 @@
+//
+//  swimEvent.m
+//  APLOCWeek2
+//
+//  Created by Brent Marohnic on 2/14/13.
+//  Copyright (c) 2013 Brent Marohnic. All rights reserved.
+//
+
+#import "swimEvent.h"
+
+@implementation swimEvent
+
+@synthesize waterTemp, eventDistance, eventName;
+
+// set unique data members from within INIT
+
+-(id)init
+{
+    self = [super init];
+    if (self != nil)
+    {
+        [self setWaterTemp:55];
+        [self setEventDistance:3];
+        [self setEventName:@"Swimming"];
+    }
+    return self;
+}
+
+// override the base event method
+// handicap equals the (absolute value of (optimum water temp - water temp) * 0.1) * (absolute value of (optimum water temp - water temp)
+// distanceHandicap equals the best training time for one mile * (distance * 1.1)
+
+-(float)calculateEventTime
+{
+    float handicap;
+    float distanceHandicap;
+    
+    handicap = abs(72 - waterTemp) * 0.1 * abs(72 - waterTemp);
+    distanceHandicap = 15 * (eventDistance * 1.1);
+    
+    [self setEventTimeInMinutes:(handicap + distanceHandicap)];
+    
+    return self.eventTimeInMinutes;
+}
+
+@end