diff --git a/Audio Original/grey.mp3 b/Audio Original/grey.mp3
new file mode 100644
index 0000000..8eb2446
Binary files /dev/null and b/Audio Original/grey.mp3 differ
diff --git a/Audio Original/ocean.mp3 b/Audio Original/ocean.mp3
new file mode 100644
index 0000000..d7dd007
Binary files /dev/null and b/Audio Original/ocean.mp3 differ
diff --git a/Audio Original/pink.mp3 b/Audio Original/pink.mp3
new file mode 100644
index 0000000..5e2d481
Binary files /dev/null and b/Audio Original/pink.mp3 differ
diff --git a/Audio Original/rain.mp3 b/Audio Original/rain.mp3
new file mode 100644
index 0000000..ac789d3
Binary files /dev/null and b/Audio Original/rain.mp3 differ
diff --git a/Audio Original/red.mp3 b/Audio Original/red.mp3
new file mode 100755
index 0000000..b1cd024
Binary files /dev/null and b/Audio Original/red.mp3 differ
diff --git a/Audio Original/space.mp3 b/Audio Original/space.mp3
new file mode 100644
index 0000000..0d8c9a9
Binary files /dev/null and b/Audio Original/space.mp3 differ
diff --git a/Audio Original/thunder.mp3 b/Audio Original/thunder.mp3
new file mode 100644
index 0000000..c010e34
Binary files /dev/null and b/Audio Original/thunder.mp3 differ
diff --git a/Novocaine iOS Example/TLC.mp3 b/Audio Original/white.mp3
old mode 100644
new mode 100755
similarity index 51%
rename from Novocaine iOS Example/TLC.mp3
rename to Audio Original/white.mp3
index a94af52..4d7c331
Binary files a/Novocaine iOS Example/TLC.mp3 and b/Audio Original/white.mp3 differ
diff --git a/Audio Original/wind.mp3 b/Audio Original/wind.mp3
new file mode 100644
index 0000000..7e9a6f9
Binary files /dev/null and b/Audio Original/wind.mp3 differ
diff --git a/Images/acknowledgements.jpg b/Images/acknowledgements.jpg
new file mode 100644
index 0000000..f1065ee
Binary files /dev/null and b/Images/acknowledgements.jpg differ
diff --git a/Images/colored.jpg b/Images/colored.jpg
new file mode 100644
index 0000000..bc10e77
Binary files /dev/null and b/Images/colored.jpg differ
diff --git a/home.jpg b/Images/home.jpg
similarity index 100%
rename from home.jpg
rename to Images/home.jpg
diff --git a/Images/monkey.jpg b/Images/monkey.jpg
new file mode 100644
index 0000000..6412b66
Binary files /dev/null and b/Images/monkey.jpg differ
diff --git a/Images/nature.jpg b/Images/nature.jpg
new file mode 100644
index 0000000..144b63d
Binary files /dev/null and b/Images/nature.jpg differ
diff --git a/Noise Manipulation.xcodeproj/project.pbxproj b/Noise Manipulation.xcodeproj/project.pbxproj
index 875dd09..cc9c671 100644
--- a/Noise Manipulation.xcodeproj/project.pbxproj	
+++ b/Noise Manipulation.xcodeproj/project.pbxproj	
@@ -9,7 +9,18 @@
 /* Begin PBXBuildFile section */
 		320C8E171DF7D6BC00FB9B19 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 320C8E161DF7D6BC00FB9B19 /* AVKit.framework */; };
 		320C8E191DF7D73A00FB9B19 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 320C8E181DF7D73A00FB9B19 /* AVFoundation.framework */; };
+		321D8B3D1DF95F7600765849 /* README.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 321D8B3C1DF95F7600765849 /* README.rtf */; };
+		322AD4ED1DF9112000A67079 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 322AD4EC1DF9112000A67079 /* UIKit.framework */; };
 		327D992C1DF6A15F00236428 /* AcknowledgementsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 327D992B1DF6A15F00236428 /* AcknowledgementsViewController.m */; };
+		327EA3161E01D493006BC991 /* grey.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 327EA30D1E01D493006BC991 /* grey.mp3 */; };
+		327EA3171E01D493006BC991 /* ocean.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 327EA30E1E01D493006BC991 /* ocean.mp3 */; };
+		327EA3191E01D493006BC991 /* rain.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 327EA3101E01D493006BC991 /* rain.mp3 */; };
+		327EA31A1E01D493006BC991 /* red.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 327EA3111E01D493006BC991 /* red.mp3 */; };
+		327EA31B1E01D493006BC991 /* space.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 327EA3121E01D493006BC991 /* space.mp3 */; };
+		327EA31C1E01D493006BC991 /* thunder.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 327EA3131E01D493006BC991 /* thunder.mp3 */; };
+		327EA31D1E01D493006BC991 /* white.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 327EA3141E01D493006BC991 /* white.mp3 */; };
+		327EA31E1E01D493006BC991 /* wind.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 327EA3151E01D493006BC991 /* wind.mp3 */; };
+		327EA3201E01D5C9006BC991 /* pink.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 327EA31F1E01D5C9006BC991 /* pink.mp3 */; };
 		32FBE0001DF49E3A00406E39 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBDFFF1DF49E3A00406E39 /* main.m */; };
 		32FBE0031DF49E3A00406E39 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBE0021DF49E3A00406E39 /* AppDelegate.m */; };
 		32FBE0061DF49E3A00406E39 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBE0051DF49E3A00406E39 /* ViewController.m */; };
@@ -20,10 +31,7 @@
 		32FBE0241DF49E3A00406E39 /* Noise_ManipulationUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBE0231DF49E3A00406E39 /* Noise_ManipulationUITests.m */; };
 		32FBE0331DF49E7800406E39 /* NatureNoisesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBE0321DF49E7800406E39 /* NatureNoisesViewController.m */; };
 		32FBE0391DF4B83600406E39 /* ColoredNoiseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBE0381DF4B83600406E39 /* ColoredNoiseViewController.m */; };
-		32FBE03C1DF4B85A00406E39 /* BinauralBeatViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBE03B1DF4B85A00406E39 /* BinauralBeatViewController.m */; };
 		32FBE03F1DF4B87500406E39 /* NoiseCancellationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 32FBE03E1DF4B87500406E39 /* NoiseCancellationViewController.m */; };
-		8477C4C31DF9028500704445 /* red.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 8477C4C11DF9028500704445 /* red.mp3 */; };
-		8477C4C41DF9028500704445 /* white.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 8477C4C21DF9028500704445 /* white.mp3 */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -46,8 +54,19 @@
 /* Begin PBXFileReference section */
 		320C8E161DF7D6BC00FB9B19 /* AVKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; };
 		320C8E181DF7D73A00FB9B19 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+		321D8B3C1DF95F7600765849 /* README.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = README.rtf; sourceTree = "<group>"; };
+		322AD4EC1DF9112000A67079 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
 		327D992A1DF6A15F00236428 /* AcknowledgementsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AcknowledgementsViewController.h; sourceTree = "<group>"; };
 		327D992B1DF6A15F00236428 /* AcknowledgementsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AcknowledgementsViewController.m; sourceTree = "<group>"; };
+		327EA30D1E01D493006BC991 /* grey.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = grey.mp3; path = Audio/grey.mp3; sourceTree = "<group>"; };
+		327EA30E1E01D493006BC991 /* ocean.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = ocean.mp3; path = Audio/ocean.mp3; sourceTree = "<group>"; };
+		327EA3101E01D493006BC991 /* rain.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = rain.mp3; path = Audio/rain.mp3; sourceTree = "<group>"; };
+		327EA3111E01D493006BC991 /* red.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = red.mp3; path = Audio/red.mp3; sourceTree = "<group>"; };
+		327EA3121E01D493006BC991 /* space.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = space.mp3; path = Audio/space.mp3; sourceTree = "<group>"; };
+		327EA3131E01D493006BC991 /* thunder.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = thunder.mp3; path = Audio/thunder.mp3; sourceTree = "<group>"; };
+		327EA3141E01D493006BC991 /* white.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = white.mp3; path = Audio/white.mp3; sourceTree = "<group>"; };
+		327EA3151E01D493006BC991 /* wind.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = wind.mp3; path = Audio/wind.mp3; sourceTree = "<group>"; };
+		327EA31F1E01D5C9006BC991 /* pink.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = pink.mp3; path = Audio/pink.mp3; sourceTree = "<group>"; };
 		32FBDFFB1DF49E3A00406E39 /* Noise Manipulation.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Noise Manipulation.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		32FBDFFF1DF49E3A00406E39 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
 		32FBE0011DF49E3A00406E39 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
@@ -68,12 +87,8 @@
 		32FBE0321DF49E7800406E39 /* NatureNoisesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NatureNoisesViewController.m; sourceTree = "<group>"; };
 		32FBE0371DF4B83600406E39 /* ColoredNoiseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColoredNoiseViewController.h; sourceTree = "<group>"; };
 		32FBE0381DF4B83600406E39 /* ColoredNoiseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ColoredNoiseViewController.m; sourceTree = "<group>"; };
-		32FBE03A1DF4B85A00406E39 /* BinauralBeatViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BinauralBeatViewController.h; sourceTree = "<group>"; };
-		32FBE03B1DF4B85A00406E39 /* BinauralBeatViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BinauralBeatViewController.m; sourceTree = "<group>"; };
 		32FBE03D1DF4B87500406E39 /* NoiseCancellationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NoiseCancellationViewController.h; sourceTree = "<group>"; };
 		32FBE03E1DF4B87500406E39 /* NoiseCancellationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoiseCancellationViewController.m; sourceTree = "<group>"; };
-		8477C4C11DF9028500704445 /* red.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = red.mp3; path = Audio/red.mp3; sourceTree = "<group>"; };
-		8477C4C21DF9028500704445 /* white.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; name = white.mp3; path = Audio/white.mp3; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -81,6 +96,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				322AD4ED1DF9112000A67079 /* UIKit.framework in Frameworks */,
 				320C8E191DF7D73A00FB9B19 /* AVFoundation.framework in Frameworks */,
 				320C8E171DF7D6BC00FB9B19 /* AVKit.framework in Frameworks */,
 			);
@@ -106,6 +122,7 @@
 		320C8E151DF7D6BC00FB9B19 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				322AD4EC1DF9112000A67079 /* UIKit.framework */,
 				320C8E181DF7D73A00FB9B19 /* AVFoundation.framework */,
 				320C8E161DF7D6BC00FB9B19 /* AVKit.framework */,
 			);
@@ -145,6 +162,7 @@
 				32FBE00A1DF49E3A00406E39 /* Assets.xcassets */,
 				32FBE00C1DF49E3A00406E39 /* LaunchScreen.storyboard */,
 				32FBE00F1DF49E3A00406E39 /* Info.plist */,
+				321D8B3C1DF95F7600765849 /* README.rtf */,
 				32FBDFFE1DF49E3A00406E39 /* Supporting Files */,
 			);
 			path = "Noise Manipulation";
@@ -153,8 +171,15 @@
 		32FBDFFE1DF49E3A00406E39 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				8477C4C11DF9028500704445 /* red.mp3 */,
-				8477C4C21DF9028500704445 /* white.mp3 */,
+				327EA31F1E01D5C9006BC991 /* pink.mp3 */,
+				327EA30D1E01D493006BC991 /* grey.mp3 */,
+				327EA30E1E01D493006BC991 /* ocean.mp3 */,
+				327EA3101E01D493006BC991 /* rain.mp3 */,
+				327EA3111E01D493006BC991 /* red.mp3 */,
+				327EA3121E01D493006BC991 /* space.mp3 */,
+				327EA3131E01D493006BC991 /* thunder.mp3 */,
+				327EA3141E01D493006BC991 /* white.mp3 */,
+				327EA3151E01D493006BC991 /* wind.mp3 */,
 				32FBDFFF1DF49E3A00406E39 /* main.m */,
 			);
 			name = "Supporting Files";
@@ -185,8 +210,6 @@
 				32FBE0381DF4B83600406E39 /* ColoredNoiseViewController.m */,
 				32FBE0321DF49E7800406E39 /* NatureNoisesViewController.m */,
 				32FBE0311DF49E7800406E39 /* NatureNoisesViewController.h */,
-				32FBE03A1DF4B85A00406E39 /* BinauralBeatViewController.h */,
-				32FBE03B1DF4B85A00406E39 /* BinauralBeatViewController.m */,
 				32FBE03D1DF4B87500406E39 /* NoiseCancellationViewController.h */,
 				32FBE03E1DF4B87500406E39 /* NoiseCancellationViewController.m */,
 				327D992A1DF6A15F00236428 /* AcknowledgementsViewController.h */,
@@ -301,10 +324,18 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				327EA3191E01D493006BC991 /* rain.mp3 in Resources */,
 				32FBE00E1DF49E3A00406E39 /* LaunchScreen.storyboard in Resources */,
-				8477C4C41DF9028500704445 /* white.mp3 in Resources */,
+				327EA3171E01D493006BC991 /* ocean.mp3 in Resources */,
+				327EA31A1E01D493006BC991 /* red.mp3 in Resources */,
+				327EA31E1E01D493006BC991 /* wind.mp3 in Resources */,
+				327EA3161E01D493006BC991 /* grey.mp3 in Resources */,
+				321D8B3D1DF95F7600765849 /* README.rtf in Resources */,
 				32FBE00B1DF49E3A00406E39 /* Assets.xcassets in Resources */,
-				8477C4C31DF9028500704445 /* red.mp3 in Resources */,
+				327EA31C1E01D493006BC991 /* thunder.mp3 in Resources */,
+				327EA3201E01D5C9006BC991 /* pink.mp3 in Resources */,
+				327EA31D1E01D493006BC991 /* white.mp3 in Resources */,
+				327EA31B1E01D493006BC991 /* space.mp3 in Resources */,
 				32FBE0091DF49E3A00406E39 /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -336,7 +367,6 @@
 				32FBE0391DF4B83600406E39 /* ColoredNoiseViewController.m in Sources */,
 				32FBE0031DF49E3A00406E39 /* AppDelegate.m in Sources */,
 				32FBE0001DF49E3A00406E39 /* main.m in Sources */,
-				32FBE03C1DF4B85A00406E39 /* BinauralBeatViewController.m in Sources */,
 				32FBE0331DF49E7800406E39 /* NatureNoisesViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/Noise Manipulation.xcodeproj/project.xcworkspace/xcuserdata/Admin.xcuserdatad/UserInterfaceState.xcuserstate b/Noise Manipulation.xcodeproj/project.xcworkspace/xcuserdata/Admin.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 65b5830..0000000
Binary files a/Noise Manipulation.xcodeproj/project.xcworkspace/xcuserdata/Admin.xcuserdatad/UserInterfaceState.xcuserstate and /dev/null differ
diff --git a/Noise Manipulation.xcodeproj/project.xcworkspace/xcuserdata/zachdietz.xcuserdatad/UserInterfaceState.xcuserstate b/Noise Manipulation.xcodeproj/project.xcworkspace/xcuserdata/zachdietz.xcuserdatad/UserInterfaceState.xcuserstate
index 7d6d333..871858b 100644
Binary files a/Noise Manipulation.xcodeproj/project.xcworkspace/xcuserdata/zachdietz.xcuserdatad/UserInterfaceState.xcuserstate and b/Noise Manipulation.xcodeproj/project.xcworkspace/xcuserdata/zachdietz.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Noise Manipulation.xcodeproj/xcuserdata/Admin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Noise Manipulation.xcodeproj/xcuserdata/Admin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
deleted file mode 100644
index 1dc2116..0000000
--- a/Noise Manipulation.xcodeproj/xcuserdata/Admin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist	
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Bucket
-   type = "1"
-   version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "Noise Manipulation/ColoredNoiseViewController.m"
-            timestampString = "502858391.963354"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "50"
-            endingLineNumber = "50"
-            landmarkName = "-makeNoisePlayerWithFileName:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
-</Bucket>
diff --git a/Noise Manipulation.xcodeproj/xcuserdata/Admin.xcuserdatad/xcschemes/Noise Manipulation.xcscheme b/Noise Manipulation.xcodeproj/xcuserdata/Admin.xcuserdatad/xcschemes/Noise Manipulation.xcscheme
deleted file mode 100644
index 00e0fb9..0000000
--- a/Noise Manipulation.xcodeproj/xcuserdata/Admin.xcuserdatad/xcschemes/Noise Manipulation.xcscheme	
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "0810"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "32FBDFFA1DF49E3A00406E39"
-               BuildableName = "Noise Manipulation.app"
-               BlueprintName = "Noise Manipulation"
-               ReferencedContainer = "container:Noise Manipulation.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "32FBE0131DF49E3A00406E39"
-               BuildableName = "Noise ManipulationTests.xctest"
-               BlueprintName = "Noise ManipulationTests"
-               ReferencedContainer = "container:Noise Manipulation.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "32FBE01E1DF49E3A00406E39"
-               BuildableName = "Noise ManipulationUITests.xctest"
-               BlueprintName = "Noise ManipulationUITests"
-               ReferencedContainer = "container:Noise Manipulation.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
-      </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "32FBDFFA1DF49E3A00406E39"
-            BuildableName = "Noise Manipulation.app"
-            BlueprintName = "Noise Manipulation"
-            ReferencedContainer = "container:Noise Manipulation.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "32FBDFFA1DF49E3A00406E39"
-            BuildableName = "Noise Manipulation.app"
-            BlueprintName = "Noise Manipulation"
-            ReferencedContainer = "container:Noise Manipulation.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <BuildableProductRunnable
-         runnableDebuggingMode = "0">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "32FBDFFA1DF49E3A00406E39"
-            BuildableName = "Noise Manipulation.app"
-            BlueprintName = "Noise Manipulation"
-            ReferencedContainer = "container:Noise Manipulation.xcodeproj">
-         </BuildableReference>
-      </BuildableProductRunnable>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>
diff --git a/Noise Manipulation.xcodeproj/xcuserdata/Admin.xcuserdatad/xcschemes/xcschememanagement.plist b/Noise Manipulation.xcodeproj/xcuserdata/Admin.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index fb8aba2..0000000
--- a/Noise Manipulation.xcodeproj/xcuserdata/Admin.xcuserdatad/xcschemes/xcschememanagement.plist	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>Noise Manipulation.xcscheme</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-	<key>SuppressBuildableAutocreation</key>
-	<dict>
-		<key>32FBDFFA1DF49E3A00406E39</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-		<key>32FBE0131DF49E3A00406E39</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-		<key>32FBE01E1DF49E3A00406E39</key>
-		<dict>
-			<key>primary</key>
-			<true/>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/Noise Manipulation.xcodeproj/xcuserdata/zachdietz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Noise Manipulation.xcodeproj/xcuserdata/zachdietz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index 88077e5..9d2f4d6 100644
--- a/Noise Manipulation.xcodeproj/xcuserdata/zachdietz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist	
+++ b/Noise Manipulation.xcodeproj/xcuserdata/zachdietz.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist	
@@ -93,15 +93,59 @@
             shouldBeEnabled = "No"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
-            filePath = "Noise Manipulation/ColoredNoiseViewController.m"
-            timestampString = "502835794.471506"
+            filePath = "Noise Manipulation/AcknowledgementsViewController.m"
+            timestampString = "502847021.879303"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "39"
-            endingLineNumber = "39"
-            landmarkName = "-pinkNoise:"
+            startingLineNumber = "28"
+            endingLineNumber = "28"
+            landmarkName = "@implementation AcknowledgementsViewController"
+            landmarkType = "3">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Noise Manipulation/ViewController.m"
+            timestampString = "502882196.505761"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "106"
+            endingLineNumber = "106"
+            landmarkName = "-didReceiveMemoryWarning"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Noise Manipulation/ColoredNoiseViewController.m"
+            timestampString = "502875118.094651"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "10"
+            endingLineNumber = "10">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Noise Manipulation/ViewController.m"
+            timestampString = "502875632.306827"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "10"
+            endingLineNumber = "10">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/Noise Manipulation/AcknowledgementsViewController.h b/Noise Manipulation/AcknowledgementsViewController.h
index dd03cfc..dce2470 100644
--- a/Noise Manipulation/AcknowledgementsViewController.h	
+++ b/Noise Manipulation/AcknowledgementsViewController.h	
@@ -9,5 +9,6 @@
 #import <UIKit/UIKit.h>
 
 @interface AcknowledgementsViewController : UIViewController
+@property (weak, nonatomic) IBOutlet UIImageView *acknowledgementsView;
 
 @end
diff --git a/Noise Manipulation/AcknowledgementsViewController.m b/Noise Manipulation/AcknowledgementsViewController.m
index 51fa4f5..f02e4be 100644
--- a/Noise Manipulation/AcknowledgementsViewController.m	
+++ b/Noise Manipulation/AcknowledgementsViewController.m	
@@ -16,7 +16,8 @@ @implementation AcknowledgementsViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
+    // Load background image
+    [self.acknowledgementsView setImage:[UIImage imageNamed:@"acknowledgements"]];
 }
 
 - (void)didReceiveMemoryWarning {
@@ -24,14 +25,4 @@ - (void)didReceiveMemoryWarning {
     // Dispose of any resources that can be recreated.
 }
 
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
 @end
diff --git a/Noise Manipulation/Assets.xcassets/acknowledgements.imageset/Contents.json b/Noise Manipulation/Assets.xcassets/acknowledgements.imageset/Contents.json
new file mode 100644
index 0000000..1d61c09
--- /dev/null
+++ b/Noise Manipulation/Assets.xcassets/acknowledgements.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "acknowledgements.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Noise Manipulation/Assets.xcassets/acknowledgements.imageset/acknowledgements.jpg b/Noise Manipulation/Assets.xcassets/acknowledgements.imageset/acknowledgements.jpg
new file mode 100644
index 0000000..f1065ee
Binary files /dev/null and b/Noise Manipulation/Assets.xcassets/acknowledgements.imageset/acknowledgements.jpg differ
diff --git a/Noise Manipulation/Assets.xcassets/monkey.imageset/Contents.json b/Noise Manipulation/Assets.xcassets/monkey.imageset/Contents.json
new file mode 100644
index 0000000..e21e7e3
--- /dev/null
+++ b/Noise Manipulation/Assets.xcassets/monkey.imageset/Contents.json	
@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "monkey.jpg",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Noise Manipulation/Assets.xcassets/monkey.imageset/monkey.jpg b/Noise Manipulation/Assets.xcassets/monkey.imageset/monkey.jpg
new file mode 100644
index 0000000..6412b66
Binary files /dev/null and b/Noise Manipulation/Assets.xcassets/monkey.imageset/monkey.jpg differ
diff --git a/Noise Manipulation/Audio/grey.mp3 b/Noise Manipulation/Audio/grey.mp3
new file mode 100644
index 0000000..8eb2446
Binary files /dev/null and b/Noise Manipulation/Audio/grey.mp3 differ
diff --git a/Noise Manipulation/Audio/ocean.mp3 b/Noise Manipulation/Audio/ocean.mp3
new file mode 100644
index 0000000..32cacef
Binary files /dev/null and b/Noise Manipulation/Audio/ocean.mp3 differ
diff --git a/Noise Manipulation/Audio/pink.mp3 b/Noise Manipulation/Audio/pink.mp3
new file mode 100644
index 0000000..be3abb6
Binary files /dev/null and b/Noise Manipulation/Audio/pink.mp3 differ
diff --git a/Noise Manipulation/Audio/rain.mp3 b/Noise Manipulation/Audio/rain.mp3
new file mode 100644
index 0000000..76875d3
Binary files /dev/null and b/Noise Manipulation/Audio/rain.mp3 differ
diff --git a/Noise Manipulation/Audio/red.mp3 b/Noise Manipulation/Audio/red.mp3
index b1cd024..259abff 100644
Binary files a/Noise Manipulation/Audio/red.mp3 and b/Noise Manipulation/Audio/red.mp3 differ
diff --git a/Noise Manipulation/Audio/space.mp3 b/Noise Manipulation/Audio/space.mp3
new file mode 100644
index 0000000..5b76118
Binary files /dev/null and b/Noise Manipulation/Audio/space.mp3 differ
diff --git a/Noise Manipulation/Audio/thunder.mp3 b/Noise Manipulation/Audio/thunder.mp3
new file mode 100644
index 0000000..f95197f
Binary files /dev/null and b/Noise Manipulation/Audio/thunder.mp3 differ
diff --git a/Noise Manipulation/Audio/white.mp3 b/Noise Manipulation/Audio/white.mp3
old mode 100644
new mode 100755
diff --git a/Noise Manipulation/Audio/wind.mp3 b/Noise Manipulation/Audio/wind.mp3
new file mode 100644
index 0000000..4c0f6ee
Binary files /dev/null and b/Noise Manipulation/Audio/wind.mp3 differ
diff --git a/Noise Manipulation/AudioFileReader.h b/Noise Manipulation/AudioFileReader.h
deleted file mode 100644
index 613b4d9..0000000
--- a/Noise Manipulation/AudioFileReader.h	
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-#import <Foundation/Foundation.h>
-#import "RingBuffer.h"
-#import "Novocaine.h"
-
-// ARC only supports GCD objects if the minimum deployment target is iOS 6+ or OS X 10.8+
-#if TARGET_OS_IPHONE
-  // Compiling for iOS
-    #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000   // iOS 6.0 or later
-        #define NEEDS_DISPATCH_RETAIN_RELEASE 0
-    #else                                           // iOS 5.x or earlier
-        #define NEEDS_DISPATCH_RETAIN_RELEASE 1
-    #endif
-#else
-    // Compiling for Mac OS X
-    #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080       // Mac OS X 10.8 or later
-        #define NEEDS_DISPATCH_RETAIN_RELEASE 0
-    #else
-        #define NEEDS_DISPATCH_RETAIN_RELEASE 1     // Mac OS X 10.7 or earlier
-    #endif
-#endif
-
-@interface AudioFileReader : NSObject
-
-// ----- Read-write ------
-
-@property (nonatomic, assign, getter=getCurrentTime, setter=setCurrentTime:) float currentTime;
-@property (nonatomic, copy) NovocaineInputBlock readerBlock;
-@property (nonatomic, assign) float latency;
-
-// ----- Read-only ------
-
-@property (nonatomic, copy, readonly)   NSURL *audioFileURL;
-@property (nonatomic, assign, readonly, getter=getDuration) float duration;
-@property (nonatomic, assign, readonly) float samplingRate;
-@property (nonatomic, assign, readonly) UInt32 numChannels;
-@property (nonatomic, assign, readonly) BOOL playing;
-
-
-- (id)initWithAudioFileURL:(NSURL *)urlToAudioFile samplingRate:(float)thisSamplingRate numChannels:(UInt32)thisNumChannels;
-
-// You use this method to grab audio if you have your own callback.
-// The buffer'll fill at the speed the audio is normally being played.
-
-- (void)retrieveFreshAudio:(float *)buffer numFrames:(UInt32)thisNumFrames numChannels:(UInt32)thisNumChannels;
-
-- (void)play;
-- (void)pause;
-- (void)stop;
-
-
-@end
diff --git a/Noise Manipulation/AudioFileWriter.h b/Noise Manipulation/AudioFileWriter.h
deleted file mode 100644
index bdacd49..0000000
--- a/Noise Manipulation/AudioFileWriter.h	
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-//  AudioFileWriter.h
-//  Novocaine
-//
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-#import <Foundation/Foundation.h>
-#import "Novocaine.h"
-
-
-@interface AudioFileWriter : NSObject
-
-// ----- Read-write ------
-@property (nonatomic, copy) NovocaineInputBlock writerBlock;
-
-// ----- Read-only ------
-@property (nonatomic, assign, getter=getDuration, readonly) float currentTime;
-@property (nonatomic, assign, getter=getDuration, readonly) float duration;
-@property (nonatomic, assign, readonly) float samplingRate;
-@property (nonatomic, assign, readonly) UInt32 numChannels;
-@property (nonatomic, assign, readonly) float latency;
-@property (nonatomic, copy, readonly)   NSURL *audioFileURL;
-@property (nonatomic, assign, readonly) BOOL recording;
-
-
-- (id)initWithAudioFileURL:(NSURL *)urlToAudioFile samplingRate:(float)thisSamplingRate numChannels:(UInt32)thisNumChannels;
-
-// You use this method to grab audio if you have your own callback.
-// The buffer'll fill at the speed the audio is normally being played.
-- (void)writeNewAudio:(float *)newData numFrames:(UInt32)thisNumFrames numChannels:(UInt32)thisNumChannels;
-
-- (void)record;
-- (void)pause;
-
-
-@end
diff --git a/Noise Manipulation/Base.lproj/LaunchScreen.storyboard b/Noise Manipulation/Base.lproj/LaunchScreen.storyboard
index fdf3f97..05b1bd9 100644
--- a/Noise Manipulation/Base.lproj/LaunchScreen.storyboard	
+++ b/Noise Manipulation/Base.lproj/LaunchScreen.storyboard	
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11134" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11106"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
diff --git a/Noise Manipulation/Base.lproj/Main.storyboard b/Noise Manipulation/Base.lproj/Main.storyboard
index 84a0dbd..b62722f 100644
--- a/Noise Manipulation/Base.lproj/Main.storyboard	
+++ b/Noise Manipulation/Base.lproj/Main.storyboard	
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_0" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
@@ -26,47 +26,51 @@
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qT1-Pz-MPK">
-                                <rect key="frame" x="44" y="178" width="233" height="69"/>
+                                <rect key="frame" x="33" y="174" width="254" height="77"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="32"/>
                                 <state key="normal" title="Colored Noises"/>
                                 <connections>
+                                    <action selector="coloredNoises:" destination="BYZ-38-t0r" eventType="touchUpInside" id="5zo-k3-1YJ"/>
                                     <segue destination="aRG-Oz-PNp" kind="show" id="EWu-0y-jY1"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="upO-48-t0p">
-                                <rect key="frame" x="46" y="293" width="229" height="48"/>
+                                <rect key="frame" x="26" y="278" width="269" height="70"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="32"/>
-                                <state key="normal" title="Binaural Beats"/>
+                                <state key="normal" title="Surprise Me!"/>
                                 <connections>
-                                    <segue destination="Lt3-A9-oIc" kind="show" id="Mjq-bt-uNz"/>
+                                    <action selector="surpriseMe:" destination="BYZ-38-t0r" eventType="touchUpInside" id="BGQ-z7-tEN"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xyK-Yl-lWb">
-                                <rect key="frame" x="19" y="380" width="283" height="89"/>
+                                <rect key="frame" x="16" y="376" width="288" height="94"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="32"/>
                                 <state key="normal" title="Noise Cancellation"/>
                                 <connections>
+                                    <action selector="noiseCancellation:" destination="BYZ-38-t0r" eventType="touchUpInside" id="4if-7f-jfX"/>
                                     <segue destination="XhI-BO-Fap" kind="show" id="7IV-5h-If2"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" restorationIdentifier="naturalNoise" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="04e-IK-8by">
-                                <rect key="frame" x="53" y="85" width="215" height="49"/>
+                                <rect key="frame" x="33" y="74" width="254" height="67"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="32"/>
                                 <state key="normal" title="Nature Noises"/>
                                 <connections>
+                                    <action selector="natureNoises:" destination="BYZ-38-t0r" eventType="touchUpInside" id="QXT-uU-4iI"/>
                                     <segue destination="XqY-f3-sCI" kind="show" id="sQY-dp-2Rl"/>
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="rtw-ry-oFK">
-                                <rect key="frame" x="160" y="529" width="144" height="31"/>
+                                <rect key="frame" x="159" y="524" width="161" height="44"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                 <state key="normal" title="Acknowledgments"/>
                                 <connections>
+                                    <action selector="acknowledgments:" destination="BYZ-38-t0r" eventType="touchUpInside" id="5fj-E8-g4C"/>
                                     <segue destination="AlL-cY-EB1" kind="show" id="Pjs-3G-gyJ"/>
                                 </connections>
                             </button>
@@ -98,19 +102,8 @@
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3bS-Mt-87U">
-                                <rect key="frame" x="16" y="20" width="46" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" title="Back">
-                                    <color key="titleColor" white="0.022279094827586207" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <connections>
-                                    <action selector="backButton:" destination="aRG-Oz-PNp" eventType="touchUpInside" id="8BM-47-RGo"/>
-                                    <segue destination="BYZ-38-t0r" kind="show" id="n9e-ou-aVb"/>
-                                </connections>
-                            </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m13-ld-Wwp">
-                                <rect key="frame" x="113" y="118" width="94" height="30"/>
+                                <rect key="frame" x="87" y="95" width="146" height="60"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="34"/>
                                 <state key="normal" title="White">
@@ -121,7 +114,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QCj-hX-r7q">
-                                <rect key="frame" x="122" y="217" width="77" height="30"/>
+                                <rect key="frame" x="107" y="204" width="107" height="49"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="34"/>
                                 <state key="normal" title="Pink">
@@ -131,8 +124,19 @@
                                     <action selector="pinkNoise:" destination="aRG-Oz-PNp" eventType="touchUpInside" id="0lD-ZU-8bS"/>
                                 </connections>
                             </button>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vf5-dO-Mim">
+                                <rect key="frame" x="101" y="427" width="118" height="56"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="34"/>
+                                <state key="normal" title="Grey">
+                                    <color key="titleColor" white="0.74101480533336772" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="greyNoise:" destination="aRG-Oz-PNp" eventType="touchUpInside" id="SUT-U4-gqz"/>
+                                </connections>
+                            </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lx7-Pn-rgG">
-                                <rect key="frame" x="94" y="323" width="131" height="30"/>
+                                <rect key="frame" x="101" y="311" width="118" height="57"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="34"/>
                                 <state key="normal" title="Red">
@@ -142,15 +146,15 @@
                                     <action selector="redNoise:" destination="aRG-Oz-PNp" eventType="touchUpInside" id="MI9-pT-vxs"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vf5-dO-Mim">
-                                <rect key="frame" x="94" y="439" width="131" height="30"/>
+                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3bS-Mt-87U">
+                                <rect key="frame" x="0.0" y="0.0" width="77" height="55"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="34"/>
-                                <state key="normal" title="Grey">
-                                    <color key="titleColor" white="0.74101480533336772" alpha="1" colorSpace="calibratedWhite"/>
+                                <state key="normal" title="Back">
+                                    <color key="titleColor" white="0.022279094827586207" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
                                 <connections>
-                                    <action selector="greyNoise:" destination="aRG-Oz-PNp" eventType="touchUpInside" id="SUT-U4-gqz"/>
+                                    <action selector="backButton:" destination="aRG-Oz-PNp" eventType="touchUpInside" id="bsV-Tg-VbZ"/>
+                                    <segue destination="BYZ-38-t0r" kind="show" id="n9e-ou-aVb"/>
                                 </connections>
                             </button>
                         </subviews>
@@ -164,34 +168,6 @@
             </objects>
             <point key="canvasLocation" x="1312.5" y="-333.80281690140845"/>
         </scene>
-        <!--Binaural Beat View Controller-->
-        <scene sceneID="5nt-ck-QGh">
-            <objects>
-                <viewController id="Lt3-A9-oIc" customClass="BinauralBeatViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="sr6-Ju-FpF"/>
-                        <viewControllerLayoutGuide type="bottom" id="0ip-vD-6fZ"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="T1o-fr-HAi" customClass="Bi">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="n2Z-l9-b6E">
-                                <rect key="frame" x="16" y="20" width="46" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" title="Back"/>
-                                <connections>
-                                    <segue destination="BYZ-38-t0r" kind="show" id="fbC-zt-3Fx"/>
-                                </connections>
-                            </button>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="5Zc-2J-mAg" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1312.5" y="387.67605633802816"/>
-        </scene>
         <!--Noise Cancellation View Controller-->
         <scene sceneID="d6E-F2-btg">
             <objects>
@@ -204,8 +180,42 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Coming Soon!" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IPI-XB-ekW">
+                                <rect key="frame" x="54" y="43" width="220" height="35"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="32"/>
+                                <color key="textColor" red="0.92649705497382195" green="0.048175894415933167" blue="0.042044203279095506" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="10" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DfN-Dz-tin">
+                                <rect key="frame" x="19" y="263" width="284" height="137"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <string key="text">Initially, our goal was to create an application that could hear ambient noise, process that noise, and then play the noise out of a microphone. More specifically, we hoped to shift the phase of the ambient noise by 180 degrees when we processed it, so that it would deconstruct with the ambient noise and effectively cancel the sound around you.</string>
+                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="RVW-Rl-L10">
+                                <rect key="frame" x="20" y="83" width="280" height="192"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="11" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y19-34-gSL">
+                                <rect key="frame" x="19" y="372" width="282" height="176"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <string key="text">Unfortunately, we have not been able to accomplish this. (Yet!) With the GitHub novocaine, we have been able to hear ambient noise, process it, and output it. However, we could not accomplish this in a way that comes close to cancelling the sound around you. Additionally, we were unable to integrate the novocaine code into our own application successfully because it relies on many libraries and custom function that are very difficult to implement into your own code. </string>
+                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Hopefully, in the future this screen will be working!" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BBM-va-v28">
+                                <rect key="frame" x="19" y="522" width="282" height="37"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RNU-2D-p6A">
-                                <rect key="frame" x="16" y="28" width="46" height="30"/>
+                                <rect key="frame" x="0.0" y="0.0" width="72" height="51"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <state key="normal" title="Back"/>
                                 <connections>
@@ -215,10 +225,13 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
+                    <connections>
+                        <outlet property="noiseCancellationView" destination="RVW-Rl-L10" id="7vW-oF-c6t"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="NXA-hl-rOl" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="1313" y="1203"/>
+            <point key="canvasLocation" x="1312.5" y="470.07042253521126"/>
         </scene>
         <!--Acknowledgements View Controller-->
         <scene sceneID="vMh-Vk-dqJ">
@@ -232,10 +245,39 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="j1f-5r-cUD">
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Acknowledgements" textAlignment="justified" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EPZ-mO-2Dc">
+                                <rect key="frame" x="29" y="53" width="262" height="45"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="26"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="10" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ohu-BU-3YD">
+                                <rect key="frame" x="16" y="383" width="275" height="151"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <string key="text">      Additionally, we wish to thank Martin Driver for his nature photo, Zynga for their monkey photo, the Pinterest “My IOS7 Wallpaper” for their rainbow sunset photo, and the Pinterest “wallpapers &amp; headers ❤️” for their blue background. Lastly, a huge thanks to Josh Dietz for his home screen design!</string>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="24" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SDT-nk-Sun">
+                                <rect key="frame" x="16" y="96" width="288" height="295"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <string key="text">      This app was created by Jeb King and Zach Dietz. We have no intention of commercializing it and only created it for our own learning experience. To this end, we do not take credit for any of the sound tracks or images used in this project. We would like to thank www.meditationrelaxclub.com for their rain track, Relaxing White Noise LLC for their celestial track, YogaYak for their ocean track, Relaxing Soundzzz for their wind track, www.virtualdreamer.com for their pink noise track, and DaleSnale for their grey noise track. We would also like to thank Audacity for giving us the capabilities to make our red and white noise tracks as well as modify all the aforementioned tracks. </string>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="knR-6m-lqq">
-                                <rect key="frame" x="16" y="20" width="46" height="30"/>
+                                <rect key="frame" x="0.0" y="0.0" width="66" height="45"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <state key="normal" title="Back"/>
+                                <state key="normal" title="Back">
+                                    <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                </state>
                                 <connections>
                                     <segue destination="BYZ-38-t0r" kind="show" id="bZ8-fU-0q1"/>
                                 </connections>
@@ -243,15 +285,18 @@
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     </view>
+                    <connections>
+                        <outlet property="acknowledgementsView" destination="j1f-5r-cUD" id="vVx-lK-vCg"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Fqf-1r-YSI" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="868" y="1974"/>
+            <point key="canvasLocation" x="1312.5" y="1304.5774647887324"/>
         </scene>
         <!--Nature Noises View Controller-->
         <scene sceneID="EjT-Yz-ncN">
             <objects>
-                <viewController id="XqY-f3-sCI" customClass="NatureNoisesViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="NatureNoisesViewController" id="XqY-f3-sCI" customClass="NatureNoisesViewController" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="EZS-dV-JAc"/>
                         <viewControllerLayoutGuide type="bottom" id="dZc-SI-2F9"/>
@@ -265,13 +310,14 @@
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="L09-AM-jma">
-                                <rect key="frame" x="16" y="20" width="46" height="30"/>
+                                <rect key="frame" x="0.0" y="0.0" width="76" height="56"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="15"/>
                                 <state key="normal" title="Back">
                                     <color key="titleColor" red="1" green="0.45718923700000003" blue="0.041811960299999999" alpha="1" colorSpace="calibratedRGB"/>
                                 </state>
                                 <connections>
+                                    <action selector="backButton:" destination="XqY-f3-sCI" eventType="touchUpInside" id="cH8-qq-XAk"/>
                                     <segue destination="BYZ-38-t0r" kind="show" id="PAH-Ok-GHc"/>
                                 </connections>
                             </button>
@@ -287,7 +333,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Uya-tg-ePh">
-                                <rect key="frame" x="103" y="247" width="116" height="41"/>
+                                <rect key="frame" x="84" y="235" width="153" height="67"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="32"/>
                                 <size key="titleShadowOffset" width="2" height="2"/>
@@ -299,7 +345,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZH8-gg-Crz">
-                                <rect key="frame" x="95" y="337" width="131" height="53"/>
+                                <rect key="frame" x="84" y="330" width="153" height="66"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="32"/>
                                 <state key="normal" title="Ocean">
@@ -310,7 +356,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4ML-Bt-ygQ">
-                                <rect key="frame" x="92" y="433" width="136" height="50"/>
+                                <rect key="frame" x="84" y="425" width="153" height="63"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="32"/>
                                 <size key="titleShadowOffset" width="2" height="2"/>
@@ -322,7 +368,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KdU-Nu-X8U">
-                                <rect key="frame" x="123" y="48" width="74" height="52"/>
+                                <rect key="frame" x="103" y="36" width="116" height="71"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="32"/>
                                 <size key="titleShadowOffset" width="2" height="2"/>
diff --git a/Noise Manipulation/BinauralBeatViewController.h b/Noise Manipulation/BinauralBeatViewController.h
deleted file mode 100644
index 3dfc88e..0000000
--- a/Noise Manipulation/BinauralBeatViewController.h	
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  BinauralBeatViewController.h
-//  Noise Manipulation
-//
-//  Created by Zachary Dietz on 12/4/16.
-//  Copyright © 2016 Dietz and King. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface BinauralBeatViewController : UIViewController
-
-@end
diff --git a/Noise Manipulation/BinauralBeatViewController.m b/Noise Manipulation/BinauralBeatViewController.m
deleted file mode 100644
index 5f09f6f..0000000
--- a/Noise Manipulation/BinauralBeatViewController.m	
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  BinauralBeatViewController.m
-//  Noise Manipulation
-//
-//  Created by Zachary Dietz on 12/4/16.
-//  Copyright © 2016 Dietz and King. All rights reserved.
-//
-
-#import "BinauralBeatViewController.h"
-
-@interface BinauralBeatViewController ()
-
-@end
-
-@implementation BinauralBeatViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/Noise Manipulation/ColoredNoiseViewController.h b/Noise Manipulation/ColoredNoiseViewController.h
index 86f865a..f7e3c6d 100644
--- a/Noise Manipulation/ColoredNoiseViewController.h	
+++ b/Noise Manipulation/ColoredNoiseViewController.h	
@@ -8,9 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-
 @interface ColoredNoiseViewController : UIViewController
-
 @property (weak, nonatomic) IBOutlet UIImageView *coloredNoisesView;
 
 @end
diff --git a/Noise Manipulation/ColoredNoiseViewController.m b/Noise Manipulation/ColoredNoiseViewController.m
index ef78960..5f70429 100644
--- a/Noise Manipulation/ColoredNoiseViewController.m	
+++ b/Noise Manipulation/ColoredNoiseViewController.m	
@@ -9,6 +9,7 @@
 #import "ColoredNoiseViewController.h"
 #import <AVFoundation/AVFoundation.h>
 
+// create audioplayer objects
 @interface ColoredNoiseViewController ()
 {
     AVAudioPlayer *white;
@@ -22,34 +23,26 @@ @implementation ColoredNoiseViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view, typically from a nib.
+    // load background image
     [self.coloredNoisesView setImage:[UIImage imageNamed:@"colored.jpg"]];
     
 }
 
+// makes sure player object stops playing
 - (void)handleSoundStop:(AVAudioPlayer *)player {
     
     if(player != nil){
         if(player.isPlaying) {
             [player stop];
         }
-        // delete player?
+        // delete player
+        player = nil;
     }
 }
 
-- (IBAction)backButton:(UIButton *)sender {
-    
-    [self handleSoundStop:white];
-    [self handleSoundStop:pink];
-    [self handleSoundStop:red];
-    [self handleSoundStop:grey];
-    
-}
-
-
-
+// creates a player object based on a sound file name
 - (AVAudioPlayer *)makeNoisePlayerWithFileName:(NSString *) filename {
-
+    
     // codewithchris' code:
     NSString *path = [NSString stringWithFormat:@"%@/%@", [[NSBundle mainBundle] resourcePath], filename];
     NSURL *soundUrl = [NSURL fileURLWithPath:path];
@@ -63,8 +56,18 @@ - (AVAudioPlayer *)makeNoisePlayerWithFileName:(NSString *) filename {
     
 }
 
+// when back button is pressed, stop sound track
+- (IBAction)backButton:(UIButton *)sender {
+    
+    [self  handleSoundStop:white];
+    [self  handleSoundStop:pink];
+    [self  handleSoundStop:red];
+    [self  handleSoundStop:grey];
+    
+}
 
-- (void)noiseButtonPress:(id)sender player:(AVAudioPlayer *)player name:(NSString *)name {
+// toggles noise on/off and button display name/stop
+- (void)noiseToggle:(id)sender player:(AVAudioPlayer *)player name:(NSString *)name {
     
     // help from http://stackoverflow.com/questions/5264546/change-button-text-from-xcode
     if(!player.isPlaying) {
@@ -79,66 +82,50 @@ - (void)noiseButtonPress:(id)sender player:(AVAudioPlayer *)player name:(NSStrin
 }
 
 
-
+// handles white noise button press
 - (IBAction)whiteNoise:(id)sender {
     
     
     // initialize the sound player
     if(white == nil) {
-        white = [self makeNoisePlayerWithFileName:@"white.mp3"];
+        white = [self  makeNoisePlayerWithFileName:@"white.mp3"];
     }
     
-    [self noiseButtonPress:sender player:white name:@"White"];
-    
+    [self  noiseToggle:sender player:white name:@"White"];
     
     
 }
+
+// handles pink noise button press
 - (IBAction)pinkNoise:(id)sender {
     
     // initialize the sound player
     if(pink == nil) {
-        pink = [self makeNoisePlayerWithFileName:@"pink.mp3"];
+        pink = [self  makeNoisePlayerWithFileName:@"pink.mp3"];
     }
     
-    [self noiseButtonPress:sender player:pink name:@"Pink"];
+    [self  noiseToggle:sender player:pink name:@"Pink"];
     
 }
+
+// handles red noise button press
 - (IBAction)redNoise:(id)sender {
     // initialize the sound player
     if(red == nil) {
-        red = [self makeNoisePlayerWithFileName:@"red.mp3"];
+        red = [self  makeNoisePlayerWithFileName:@"red.mp3"];
     }
     
-    [self noiseButtonPress:sender player:red name:@"Red"];
+    [self  noiseToggle:sender player:red name:@"Red"];
 }
+
+// handles grey noise button press
 - (IBAction)greyNoise:(id)sender {
     // initialize the sound player
     if(grey == nil) {
-        grey = [self makeNoisePlayerWithFileName:@"grey.mp3"];
+        grey = [self  makeNoisePlayerWithFileName:@"grey.mp3"];
     }
     
-    [self noiseButtonPress:sender player:grey name:@"Grey"];
+    [self  noiseToggle:sender player:grey name:@"Grey"];
 }
 
 @end
-
-
-/*
- 
- - (IBAction)pinkNoise:(id)sender {
- // codewithchris' code:
- NSString *path = [NSString stringWithFormat:@"%@/pink.mp3", [[NSBundle mainBundle] resourcePath]];
- NSURL *soundUrl = [NSURL fileURLWithPath:path];
- 
- // Create audio player object and initialize with URL to sound
- pink = [[AVAudioPlayer alloc] initWithContentsOfURL:soundUrl error:nil];
- 
- [pink play];
- }
-
- 
- */
-
-
-
-
diff --git a/Noise Manipulation/NatureNoisesViewController.m b/Noise Manipulation/NatureNoisesViewController.m
index 3bb25c2..a3dcd6e 100644
--- a/Noise Manipulation/NatureNoisesViewController.m	
+++ b/Noise Manipulation/NatureNoisesViewController.m	
@@ -9,6 +9,7 @@
 #import "NatureNoisesViewController.h"
 #import <AVFoundation/AVFoundation.h>
 
+// create audioplayer objects
 @interface NatureNoisesViewController ()
 {
     AVAudioPlayer *rain;
@@ -23,60 +24,113 @@ @implementation NatureNoisesViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view, typically from a nib.
+    // load background image
     [self.natureView setImage:[UIImage imageNamed:@"nature.jpg"]];
 }
 
-- (IBAction)rainNoise:(id)sender {
+// makes sure player object stops playing
+- (void)handleSoundStop:(AVAudioPlayer *)player {
+    
+    if(player != nil){
+        if(player.isPlaying) {
+            [player stop];
+        }
+        // delete player
+        player = nil;
+    }
+}
+
+// creates a player object based on a sound file name
+- (AVAudioPlayer *)makeNoisePlayerWithFileName:(NSString *) filename {
+    
     // codewithchris' code:
-    NSString *path = [NSString stringWithFormat:@"%@/rain.mp3", [[NSBundle mainBundle] resourcePath]];
+    NSString *path = [NSString stringWithFormat:@"%@/%@", [[NSBundle mainBundle] resourcePath], filename];
     NSURL *soundUrl = [NSURL fileURLWithPath:path];
     
     // Create audio player object and initialize with URL to sound
-    rain = [[AVAudioPlayer alloc] initWithContentsOfURL:soundUrl error:nil];
+    AVAudioPlayer *player = [[AVAudioPlayer alloc] initWithContentsOfURL:soundUrl error:nil];
+    player.numberOfLoops = -1;
+    
+    return player;
     
-    [rain play];
 }
-- (IBAction)windNoise:(id)sender {
-    // codewithchris' code:
-    NSString *path = [NSString stringWithFormat:@"%@/wind.mp3", [[NSBundle mainBundle] resourcePath]];
-    NSURL *soundUrl = [NSURL fileURLWithPath:path];
+
+// toggles noise on/off and button display name/stop
+- (void)noiseToggle:(id)sender player:(AVAudioPlayer *)player name:(NSString *)name {
     
-    // Create audio player object and initialize with URL to sound
-    wind = [[AVAudioPlayer alloc] initWithContentsOfURL:soundUrl error:nil];
+    // help from http://stackoverflow.com/questions/5264546/change-button-text-from-xcode
+    if(!player.isPlaying) {
+        [player play];
+        [sender setTitle:@"Stop" forState:UIControlStateNormal];
+    }
+    else {
+        [player stop];
+        [sender setTitle:name forState:UIControlStateNormal];
+    }
     
-    [wind play];
 }
-- (IBAction)spaceNoise:(id)sender {
-    // codewithchris' code:
-    NSString *path = [NSString stringWithFormat:@"%@/space.mp3", [[NSBundle mainBundle] resourcePath]];
-    NSURL *soundUrl = [NSURL fileURLWithPath:path];
+
+// when back button is pressed, stop sound track
+- (IBAction)backButton:(UIButton *)sender {
     
-    // Create audio player object and initialize with URL to sound
-    space = [[AVAudioPlayer alloc] initWithContentsOfURL:soundUrl error:nil];
+    [self handleSoundStop:rain];
+    [self handleSoundStop:wind];
+    [self handleSoundStop:space];
+    [self handleSoundStop:ocean];
+    [self handleSoundStop:thunder];
     
-    [space play];
 }
-- (IBAction)oceanNoise:(id)sender {
-    // codewithchris' code:
-    NSString *path = [NSString stringWithFormat:@"%@/ocean.mp3", [[NSBundle mainBundle] resourcePath]];
-    NSURL *soundUrl = [NSURL fileURLWithPath:path];
+
+// handles rain noise button press
+- (IBAction)rainNoise:(id)sender {
     
-    // Create audio player object and initialize with URL to sound
-    ocean = [[AVAudioPlayer alloc] initWithContentsOfURL:soundUrl error:nil];
+    // initialize the sound player
+    if(rain == nil) {
+        rain = [self makeNoisePlayerWithFileName:@"rain.mp3"];
+    }
+    
+    [self noiseToggle:sender player:rain name:@"Rain"];
     
-    [ocean play];
 }
 
-- (IBAction)thunderNoise:(id)sender {
-    // codewithchris' code:
-    NSString *path = [NSString stringWithFormat:@"%@/thunder.mp3", [[NSBundle mainBundle] resourcePath]];
-    NSURL *soundUrl = [NSURL fileURLWithPath:path];
+// handles wind noise button press
+- (IBAction)windNoise:(id)sender {
+    // initialize the sound player
+    if(wind == nil) {
+        wind = [self makeNoisePlayerWithFileName:@"wind.mp3"];
+    }
     
-    // Create audio player object and initialize with URL to sound
-    thunder = [[AVAudioPlayer alloc] initWithContentsOfURL:soundUrl error:nil];
+    [self noiseToggle:sender player:wind name:@"Wind"];
+}
+
+// handles space noise button press
+- (IBAction)spaceNoise:(id)sender {
+    // initialize the sound player
+    if(space == nil) {
+        space = [self makeNoisePlayerWithFileName:@"space.mp3"];
+    }
+    
+    [self noiseToggle:sender player:space name:@"Space"];
+}
+
+// handles ocean noise button press
+- (IBAction)oceanNoise:(id)sender {
+    // initialize the sound player
+    if(ocean == nil) {
+        ocean = [self makeNoisePlayerWithFileName:@"ocean.mp3"];
+    }
+    
+    [self noiseToggle:sender player:ocean name:@"Ocean"];
+}
+
+// handles thunder noise button press
+- (IBAction)thunderNoise:(id)sender {
+    // initialize the sound player
+    if(thunder == nil) {
+        thunder = [self makeNoisePlayerWithFileName:@"thunder.mp3"];
+    }
     
-    [thunder play];
+    [self noiseToggle:sender player:thunder name:@"Thunder"];
 }
 
 @end
diff --git a/Noise Manipulation/NoiseCancellationViewController.h b/Noise Manipulation/NoiseCancellationViewController.h
index 804f686..5f102f6 100644
--- a/Noise Manipulation/NoiseCancellationViewController.h	
+++ b/Noise Manipulation/NoiseCancellationViewController.h	
@@ -9,5 +9,6 @@
 #import <UIKit/UIKit.h>
 
 @interface NoiseCancellationViewController : UIViewController
+@property (weak, nonatomic) IBOutlet UIImageView *noiseCancellationView;
 
 @end
diff --git a/Noise Manipulation/NoiseCancellationViewController.m b/Noise Manipulation/NoiseCancellationViewController.m
index 80ae7fe..5ddc2c1 100644
--- a/Noise Manipulation/NoiseCancellationViewController.m	
+++ b/Noise Manipulation/NoiseCancellationViewController.m	
@@ -16,7 +16,8 @@ @implementation NoiseCancellationViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
+    // load background image
+    [self.noiseCancellationView setImage:[UIImage imageNamed:@"monkey.jpg"]];
 }
 
 - (void)didReceiveMemoryWarning {
@@ -24,14 +25,4 @@ - (void)didReceiveMemoryWarning {
     // Dispose of any resources that can be recreated.
 }
 
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
 @end
diff --git a/Noise Manipulation/NoiseManipulationHelpers.h b/Noise Manipulation/NoiseManipulationHelpers.h
new file mode 100644
index 0000000..7eabc32
--- /dev/null
+++ b/Noise Manipulation/NoiseManipulationHelpers.h	
@@ -0,0 +1,21 @@
+//
+//  NoiseManipulationHelpers.h
+//  Noise Manipulation
+//
+//  Created by Zachary Dietz on 12/8/16.
+//  Copyright © 2016 Dietz and King. All rights reserved.
+//
+
+#import <AVFoundation/AVFoundation.h>
+
+#ifndef NoiseManipulationHelpers_h
+#define NoiseManipulationHelpers_h
+
+@interface NoiseManipulationHelpers : NSObject
+
+@end
+
+#endif /* NoiseManipulationHelpers_h */
+
+
+
diff --git a/Noise Manipulation/NoiseManipulationHelpers.m b/Noise Manipulation/NoiseManipulationHelpers.m
new file mode 100644
index 0000000..1f5f172
--- /dev/null
+++ b/Noise Manipulation/NoiseManipulationHelpers.m	
@@ -0,0 +1,59 @@
+//
+//  NoiseManipulationHelpers.m
+//  Noise Manipulation
+//
+//  Created by Zachary Dietz on 12/8/16.
+//  Copyright © 2016 Dietz and King. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import "NoiseManipulationHelpers.h"
+
+@interface NoiseManipulationHelpers ()
+
+@end
+
+@implementation NoiseManipulationHelpers
+
+
++ (void)handleSoundStop:(AVAudioPlayer *)player {
+    
+    if(player != nil){
+        if(player.isPlaying) {
+            [player stop];
+        }
+        // delete player
+        player = nil;
+    }
+}
+
++ (AVAudioPlayer *)makeNoisePlayerWithFileName:(NSString *) filename {
+    
+    // codewithchris' code:
+    NSString *path = [NSString stringWithFormat:@"%@/%@", [[NSBundle mainBundle] resourcePath], filename];
+    NSURL *soundUrl = [NSURL fileURLWithPath:path];
+    
+    // Create audio player object and initialize with URL to sound
+    AVAudioPlayer *player = [[AVAudioPlayer alloc] initWithContentsOfURL:soundUrl error:nil];
+    player.numberOfLoops = -1;
+    
+    return player;
+    
+}
+
++ (void)noiseToggle:(id)sender player:(AVAudioPlayer *)player name:(NSString *)name {
+    
+    // help from http://stackoverflow.com/questions/5264546/change-button-text-from-xcode
+    if(!player.isPlaying) {
+        [player play];
+        [sender setTitle:@"Stop" forState:UIControlStateNormal];
+    }
+    else {
+        [player stop];
+        [sender setTitle:name forState:UIControlStateNormal];
+    }
+    
+}
+
+@end
diff --git a/Noise Manipulation/README.rtf b/Noise Manipulation/README.rtf
new file mode 100644
index 0000000..2188a6b
--- /dev/null
+++ b/Noise Manipulation/README.rtf	
@@ -0,0 +1,7 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1404\cocoasubrtf470
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww9000\viewh8400\viewkind0
+\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
+
+\f0\fs24 \cf0 See our documentation.txt and design.txt.}
\ No newline at end of file
diff --git a/Noise Manipulation/RainNoise.h b/Noise Manipulation/RainNoise.h
deleted file mode 100644
index 45672c9..0000000
--- a/Noise Manipulation/RainNoise.h	
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-//  RainNoise.h
-//  Noise Manipulation
-//
-//  Created by Zachary Dietz on 12/4/16.
-//  Copyright © 2016 Dietz and King. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface RainNoise : UIViewController
-
-@end
diff --git a/Noise Manipulation/RainNoise.m b/Noise Manipulation/RainNoise.m
deleted file mode 100644
index e2a660d..0000000
--- a/Noise Manipulation/RainNoise.m	
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-//  RainNoise.m
-//  Noise Manipulation
-//
-//  Created by Zachary Dietz on 12/4/16.
-//  Copyright © 2016 Dietz and King. All rights reserved.
-//
-
-#import "RainNoise.h"
-
-@interface RainNoise ()
-
-@end
-
-@implementation RainNoise
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end
diff --git a/Noise Manipulation/RingBuffer.h b/Noise Manipulation/RingBuffer.h
deleted file mode 100644
index 7071a63..0000000
--- a/Noise Manipulation/RingBuffer.h	
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-// TODO: Error throwing if things go wrong.
-#import <AudioToolbox/AudioToolbox.h>
-#import <Accelerate/Accelerate.h>
-
-#define kMaxNumChannels 4
-
-class RingBuffer {
-    
-public:	
-	RingBuffer() {};
-	RingBuffer(SInt64 bufferLength, SInt64 numChannels);
-	~RingBuffer();
-	
-	void AddNewSInt16AudioBuffer(const AudioBuffer aBuffer);
-	void AddNewSInt16Data(const SInt16 *newData, const SInt64 numFrames, const SInt64 whichChannel);
-	void AddNewFloatData(const float *newData, const SInt64 numFrames, const SInt64 whichChannel = 0);
-	void AddNewDoubleData(const double *newData, const SInt64 numFrames, const SInt64 whichChannel = 0);
-	void AddNewInterleavedFloatData(const float *newData, const SInt64 numFrames, const SInt64 numChannelsHere);
-    void FetchInterleavedData(float *outData, SInt64 numFrames, SInt64 numChannels);
-	void FetchFreshData(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride);
-	void FetchFreshData2(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride);
-    
-    void FetchData(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride);
-	SInt64 NumNewFrames(SInt64 lastReadFrame, int iChannel = 0);
-    SInt64 NumUnreadFrames(int iChannel = 0) {return mNumUnreadFrames[iChannel]; }
-	
-	SInt64 WriteHeadPosition(int aChannel = 0) { return mLastWrittenIndex[aChannel]; }
-	SInt64 ReadHeadPosition(int aChannel = 0) { return mLastReadIndex[aChannel]; }
-    
-    void SeekWriteHeadPosition(SInt64 offset, int iChannel=0);
-    void SeekReadHeadPosition(SInt64 offset, int iChannel=0);
-	SInt64 NumChannels() {return mNumChannels; }
-	
-	void Clear();
-	
-	// Analytics
-	float Mean(const SInt64 whichChannel = 0);
-	float Max(const SInt64 whichChannel = 0);
-	float Min(const SInt64 whichChannel = 0);
-	
-protected:
-	int64_t mLastWrittenIndex[kMaxNumChannels];
-	int64_t mLastReadIndex[kMaxNumChannels];
-    int64_t mNumUnreadFrames[kMaxNumChannels];
-	int64_t mSizeOfBuffer;
-	int64_t mNumChannels;
-	float **mData;
-	bool mAllocated;
-
-private:
-    void UpdateFrameCount(SInt64 numFrames, SInt64 channel);
-	
-};
diff --git a/Noise Manipulation/ViewController.m b/Noise Manipulation/ViewController.m
index a8a8ddb..36e7448 100644
--- a/Noise Manipulation/ViewController.m	
+++ b/Noise Manipulation/ViewController.m	
@@ -6,19 +6,101 @@
 //  Copyright © 2016 Dietz and King. All rights reserved.
 //
 
+#import "UIKit/UIKit.h"
+#import <AVFoundation/AVFoundation.h>
 #import "ViewController.h"
 
+// create audioplayer object
 @interface ViewController ()
-
+{
+    AVAudioPlayer *randomplayer;
+}
 @end
 
 @implementation ViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view, typically from a nib.
+    // Load background image
     [self.photoHomeView setImage:[UIImage imageNamed:@"home"]];
-    //[self sendSubviewToBack:self.photoHomeView];
+}
+
+// if surprise me is clicked and no track is already playing, play random track
+// else stop track
+- (IBAction)surpriseMe:(id)sender {
+    
+    if(randomplayer == nil)
+    {
+        NSArray *options = @[@"rain",@"wind",@"space",@"ocean",@"thunder",@"white",@"pink",@"red",@"grey"];
+        // generate random number
+        int rand = arc4random_uniform(9);
+        // index into array to select name
+        NSString *filename = [NSString stringWithFormat:@"%@.mp3",options[rand]];
+        // play random track
+        randomplayer = [self  makeNoisePlayerWithFileName:filename];
+    }
+    // toggle sound and name...like this if statement?? We do! XD
+    if([self  noiseToggle:sender player:randomplayer name:@"Surprise Me!"])
+    {
+        randomplayer = nil;
+    }
+}
+
+// creates a player object based on a sound file name
+- (AVAudioPlayer *)makeNoisePlayerWithFileName:(NSString *) filename {
+    
+    // codewithchris' code:
+    NSString *path = [NSString stringWithFormat:@"%@/%@", [[NSBundle mainBundle] resourcePath], filename];
+    NSURL *soundUrl = [NSURL fileURLWithPath:path];
+    
+    // Create audio player object and initialize with URL to sound
+    AVAudioPlayer *player = [[AVAudioPlayer alloc] initWithContentsOfURL:soundUrl error:nil];
+    player.numberOfLoops = -1;
+    
+    return player;
+}
+
+// toggles noise on/off and button display "surprise me"/"stop"
+- (BOOL)noiseToggle:(id)sender player:(AVAudioPlayer *)player name:(NSString *)name {
+    
+    // help from http://stackoverflow.com/questions/5264546/change-button-text-from-xcode
+    if(!player.isPlaying) {
+        [player play];
+        [sender setTitle:@"Stop" forState:UIControlStateNormal];
+        return NO;
+    }
+    else {
+        [player stop];
+        [sender setTitle:name forState:UIControlStateNormal];
+        return YES;
+    }
+    
+}
+
+// turn off surprise me track if go to another screen...
+-(void)pageChangeHandle
+{
+    if (randomplayer != nil)
+    {
+        if(randomplayer.isPlaying) {
+            [randomplayer stop];
+        }
+        // delete player
+        randomplayer = nil;
+    }
+}
+
+- (IBAction)natureNoises:(id)sender {
+    [self pageChangeHandle];
+}
+- (IBAction)coloredNoises:(id)sender {
+    [self pageChangeHandle];
+}
+- (IBAction)noiseCancellation:(id)sender {
+    [self pageChangeHandle];
+}
+- (IBAction)acknowledgments:(id)sender {
+    [self pageChangeHandle];
 }
 
 - (void)didReceiveMemoryWarning {
diff --git a/Novocaine iOS Example/AppDelegate.h b/Novocaine iOS Example/AppDelegate.h
deleted file mode 100644
index d5afc17..0000000
--- a/Novocaine iOS Example/AppDelegate.h	
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-
-#import <UIKit/UIKit.h>
-
-@class ViewController;
-
-@interface AppDelegate : UIResponder <UIApplicationDelegate>
-
-@property (strong, nonatomic) UIWindow *window;
-
-@property (strong, nonatomic) ViewController *viewController;
-
-@end
diff --git a/Novocaine iOS Example/AppDelegate.mm b/Novocaine iOS Example/AppDelegate.mm
deleted file mode 100644
index 837bab8..0000000
--- a/Novocaine iOS Example/AppDelegate.mm	
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-
-#import "AppDelegate.h"
-
-#import "ViewController.h"
-
-@implementation AppDelegate
-
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
-{
-    self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-    // Override point for customization after application launch.
-    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
-        self.viewController = [[ViewController alloc] initWithNibName:@"ViewController_iPhone" bundle:nil];
-    } else {
-        self.viewController = [[ViewController alloc] initWithNibName:@"ViewController_iPad" bundle:nil];
-    }
-    self.window.rootViewController = self.viewController;
-    [self.window makeKeyAndVisible];
-    return YES;
-}
-
-- (void)applicationWillResignActive:(UIApplication *)application
-{
-    // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-    // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-}
-
-- (void)applicationDidEnterBackground:(UIApplication *)application
-{
-    // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. 
-    // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-}
-
-- (void)applicationWillEnterForeground:(UIApplication *)application
-{
-    // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application
-{
-    // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
-}
-
-- (void)applicationWillTerminate:(UIApplication *)application
-{
-    // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
-}
-
-@end
diff --git a/Novocaine iOS Example/AudioFileWriter.h b/Novocaine iOS Example/AudioFileWriter.h
deleted file mode 100644
index bdacd49..0000000
--- a/Novocaine iOS Example/AudioFileWriter.h	
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-//  AudioFileWriter.h
-//  Novocaine
-//
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-#import <Foundation/Foundation.h>
-#import "Novocaine.h"
-
-
-@interface AudioFileWriter : NSObject
-
-// ----- Read-write ------
-@property (nonatomic, copy) NovocaineInputBlock writerBlock;
-
-// ----- Read-only ------
-@property (nonatomic, assign, getter=getDuration, readonly) float currentTime;
-@property (nonatomic, assign, getter=getDuration, readonly) float duration;
-@property (nonatomic, assign, readonly) float samplingRate;
-@property (nonatomic, assign, readonly) UInt32 numChannels;
-@property (nonatomic, assign, readonly) float latency;
-@property (nonatomic, copy, readonly)   NSURL *audioFileURL;
-@property (nonatomic, assign, readonly) BOOL recording;
-
-
-- (id)initWithAudioFileURL:(NSURL *)urlToAudioFile samplingRate:(float)thisSamplingRate numChannels:(UInt32)thisNumChannels;
-
-// You use this method to grab audio if you have your own callback.
-// The buffer'll fill at the speed the audio is normally being played.
-- (void)writeNewAudio:(float *)newData numFrames:(UInt32)thisNumFrames numChannels:(UInt32)thisNumChannels;
-
-- (void)record;
-- (void)pause;
-
-
-@end
diff --git a/Novocaine iOS Example/Novocaine iOS Example-Info.plist b/Novocaine iOS Example/Novocaine iOS Example-Info.plist
deleted file mode 100644
index 65c95ed..0000000
--- a/Novocaine iOS Example/Novocaine iOS Example-Info.plist	
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIdentifier</key>
-	<string>wiltschko.${PRODUCT_NAME:rfc1034identifier}</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UIRequiredDeviceCapabilities</key>
-	<array>
-		<string>armv7</string>
-	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-</dict>
-</plist>
diff --git a/Novocaine iOS Example/Novocaine iOS Example-Prefix.pch b/Novocaine iOS Example/Novocaine iOS Example-Prefix.pch
deleted file mode 100644
index 32790c8..0000000
--- a/Novocaine iOS Example/Novocaine iOS Example-Prefix.pch	
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// Prefix header for all source files of the 'Novocaine iOS Example' target in the 'Novocaine iOS Example' project
-//
-
-#import <Availability.h>
-
-#ifndef __IPHONE_4_0
-#warning "This project uses features only available in iOS SDK 4.0 and later."
-#endif
-
-#ifdef __OBJC__
-    #import <UIKit/UIKit.h>
-    #import <Foundation/Foundation.h>
-#endif
diff --git a/Novocaine iOS Example/Novocaine.podspec b/Novocaine iOS Example/Novocaine.podspec
deleted file mode 100644
index f164023..0000000
--- a/Novocaine iOS Example/Novocaine.podspec	
+++ /dev/null
@@ -1,11 +0,0 @@
-Pod::Spec.new do |spec|
-    spec.name         = 'Novocaine'
-    spec.version      = '0.0.1'
-    spec.summary      = 'Novocaine'
-    spec.source_files = 'Novocaine/'
-    spec.requires_arc = true
-    spec.ios.deployment_target = '5.1'
-    spec.author       = {"Alex Wiltschko" => "alex.bw@gmail.com" }
-    spec.frameworks   = 'AudioToolbox','Accelerate'
-    spec.libraries    = 'stdc++'
-end
diff --git a/Novocaine iOS Example/Novocaine/AudioFileReader.h b/Novocaine iOS Example/Novocaine/AudioFileReader.h
deleted file mode 100644
index 613b4d9..0000000
--- a/Novocaine iOS Example/Novocaine/AudioFileReader.h	
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-#import <Foundation/Foundation.h>
-#import "RingBuffer.h"
-#import "Novocaine.h"
-
-// ARC only supports GCD objects if the minimum deployment target is iOS 6+ or OS X 10.8+
-#if TARGET_OS_IPHONE
-  // Compiling for iOS
-    #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000   // iOS 6.0 or later
-        #define NEEDS_DISPATCH_RETAIN_RELEASE 0
-    #else                                           // iOS 5.x or earlier
-        #define NEEDS_DISPATCH_RETAIN_RELEASE 1
-    #endif
-#else
-    // Compiling for Mac OS X
-    #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080       // Mac OS X 10.8 or later
-        #define NEEDS_DISPATCH_RETAIN_RELEASE 0
-    #else
-        #define NEEDS_DISPATCH_RETAIN_RELEASE 1     // Mac OS X 10.7 or earlier
-    #endif
-#endif
-
-@interface AudioFileReader : NSObject
-
-// ----- Read-write ------
-
-@property (nonatomic, assign, getter=getCurrentTime, setter=setCurrentTime:) float currentTime;
-@property (nonatomic, copy) NovocaineInputBlock readerBlock;
-@property (nonatomic, assign) float latency;
-
-// ----- Read-only ------
-
-@property (nonatomic, copy, readonly)   NSURL *audioFileURL;
-@property (nonatomic, assign, readonly, getter=getDuration) float duration;
-@property (nonatomic, assign, readonly) float samplingRate;
-@property (nonatomic, assign, readonly) UInt32 numChannels;
-@property (nonatomic, assign, readonly) BOOL playing;
-
-
-- (id)initWithAudioFileURL:(NSURL *)urlToAudioFile samplingRate:(float)thisSamplingRate numChannels:(UInt32)thisNumChannels;
-
-// You use this method to grab audio if you have your own callback.
-// The buffer'll fill at the speed the audio is normally being played.
-
-- (void)retrieveFreshAudio:(float *)buffer numFrames:(UInt32)thisNumFrames numChannels:(UInt32)thisNumChannels;
-
-- (void)play;
-- (void)pause;
-- (void)stop;
-
-
-@end
diff --git a/Novocaine iOS Example/Novocaine/AudioFileReader.mm b/Novocaine iOS Example/Novocaine/AudioFileReader.mm
deleted file mode 100644
index 9a26446..0000000
--- a/Novocaine iOS Example/Novocaine/AudioFileReader.mm	
+++ /dev/null
@@ -1,286 +0,0 @@
-//
-//  AudioFileReader.m
-//  Novocaine
-//
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-#import "AudioFileReader.h"
-
-@interface AudioFileReader ()
-{
-    RingBuffer *ringBuffer;
-}
-
-// redeclaration as readwrite in class continuation
-@property (nonatomic, copy, readwrite)   NSURL *audioFileURL;
-@property (nonatomic, assign, readwrite, getter=getDuration) float duration;
-@property (nonatomic, assign, readwrite) float samplingRate;
-@property (nonatomic, assign, readwrite) UInt32 numChannels;
-@property (nonatomic, assign, readwrite) BOOL playing;
-
-@property (nonatomic, assign) AudioStreamBasicDescription outputFormat;
-@property (nonatomic, assign) ExtAudioFileRef inputFile;
-@property (nonatomic, assign) UInt32 outputBufferSize;
-@property (nonatomic, assign) float *outputBuffer;
-@property (nonatomic, assign) float *holdingBuffer;
-@property (nonatomic, assign) UInt32 numSamplesReadPerPacket;
-@property (nonatomic, assign) UInt32 desiredPrebufferedSamples;
-@property (nonatomic, assign) SInt64 currentFileTime;
-@property (nonatomic, assign) dispatch_source_t callbackTimer;
-
-- (void)bufferNewAudio;
-
-@end
-
-
-@implementation AudioFileReader
-
-
-- (void)dealloc
-{
-    // If the dispatch timer is active, close it off
-    if (self.playing)
-        [self pause];
-    
-    self.readerBlock = nil;
-    
-    // Close the ExtAudioFile
-    ExtAudioFileDispose(self.inputFile);
-    
-    free(self.outputBuffer);
-    free(self.holdingBuffer);
-    
-    delete ringBuffer;
-    
-}
-
-
-- (id)initWithAudioFileURL:(NSURL *)urlToAudioFile samplingRate:(float)thisSamplingRate numChannels:(UInt32)thisNumChannels
-{
-    self = [super init];
-    if (self)
-    {
-        
-        // Zero-out our timer, so we know we're not using our callback yet
-        self.callbackTimer = nil;
-        
-        // Open a reference to the audio file
-        self.audioFileURL = urlToAudioFile;
-        CFURLRef audioFileRef = (__bridge CFURLRef)self.audioFileURL;
-        CheckError(ExtAudioFileOpenURL(audioFileRef, &_inputFile), "Opening file URL (ExtAudioFileOpenURL)");
-
-        
-        // Set a few defaults and presets
-        self.samplingRate = thisSamplingRate;
-        self.numChannels = thisNumChannels;
-        self.latency = .011609977; // 512 samples / ( 44100 samples / sec ) default
-        
-        
-        // We're going to impose a format upon the input file
-        // Single-channel float does the trick.
-        _outputFormat.mSampleRate = self.samplingRate;
-        _outputFormat.mFormatID = kAudioFormatLinearPCM;
-        _outputFormat.mFormatFlags = kAudioFormatFlagIsFloat;
-        _outputFormat.mBytesPerPacket = 4*self.numChannels;
-        _outputFormat.mFramesPerPacket = 1;
-        _outputFormat.mBytesPerFrame = 4*self.numChannels;
-        _outputFormat.mChannelsPerFrame = self.numChannels;
-        _outputFormat.mBitsPerChannel = 32;
-        
-        // Apply the format to our file
-        ExtAudioFileSetProperty(_inputFile, kExtAudioFileProperty_ClientDataFormat, sizeof(AudioStreamBasicDescription), &_outputFormat);
-        
-        
-        // Arbitrary buffer sizes that don't matter so much as long as they're "big enough"
-        self.outputBufferSize = 65536;
-        self.numSamplesReadPerPacket = 8192;
-        self.desiredPrebufferedSamples = self.numSamplesReadPerPacket*2;
-        self.outputBuffer = (float *)calloc(2*self.samplingRate, sizeof(float));
-        self.holdingBuffer = (float *)calloc(2*self.samplingRate, sizeof(float));
-        
-        
-        // Allocate a ring buffer (this is what's going to buffer our audio)
-        ringBuffer = new RingBuffer(self.outputBufferSize, self.numChannels);
-        
-        
-        // Fill up the buffers, so we're ready to play immediately
-        [self bufferNewAudio];
-        
-    }
-    return self;
-}
-
-- (void)clearBuffer
-{
-    ringBuffer->Clear();
-}
-
-- (void)bufferNewAudio
-{
-    
-    if (ringBuffer->NumUnreadFrames() > self.desiredPrebufferedSamples)
-        return;
-    
-    memset(self.outputBuffer, 0, sizeof(float)*self.desiredPrebufferedSamples);
-    
-    AudioBufferList incomingAudio;
-    incomingAudio.mNumberBuffers = 1;
-    incomingAudio.mBuffers[0].mNumberChannels = self.numChannels;
-    incomingAudio.mBuffers[0].mDataByteSize = self.outputBufferSize;
-    incomingAudio.mBuffers[0].mData = self.outputBuffer;
-    
-    // Figure out where we are in the file
-    SInt64 frameOffset = 0;
-    ExtAudioFileTell(self.inputFile, &frameOffset);
-    self.currentFileTime = (float)frameOffset / self.samplingRate;
-
-    // Read the audio
-    UInt32 framesRead = self.numSamplesReadPerPacket;
-    ExtAudioFileRead(self.inputFile, &framesRead, &incomingAudio);
-    
-    // Update where we are in the file
-    ExtAudioFileTell(self.inputFile, &frameOffset);
-    self.currentFileTime = (float)frameOffset / self.samplingRate;
-    
-    // Seems to fix issue #85 corrupted sample reads
-    // ExtAudioFileRead(self.inputFile, &framesRead, &incomingAudio);
-    
-    if ( framesRead == 0 ) { // EOF.
-        [self pause];
-    }
-    
-    // Add the new audio to the ring buffer
-    ringBuffer->AddNewInterleavedFloatData(self.outputBuffer, framesRead, self.numChannels);
-    
-    if ((self.currentFileTime - self.duration) < 0.01 && framesRead == 0) {
-        // modified to allow for auto-stopping. //
-        // Need to change your output block to check for [fileReader playing] and nuke your fileReader if it is   //
-        // not playing and not paused, on the next frame. Otherwise, the sound clip's final buffer is not played. //
-//        self.currentTime = 0.0f;
-        [self stop];
-        ringBuffer->Clear();
-    }
-    
-    
-}
-
-- (float)getCurrentTime
-{
-    return self.currentFileTime - ringBuffer->NumUnreadFrames()/self.samplingRate;
-}
-
-
-- (void)setCurrentTime:(float)thisCurrentTime
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self clearBuffer];
-        ExtAudioFileSeek(self.inputFile, thisCurrentTime*self.samplingRate);
-    });
-}
-
-- (float)getDuration
-{
-    // We're going to directly calculate the duration of the audio file (in seconds)
-    SInt64 framesInThisFile;
-    UInt32 propertySize = sizeof(framesInThisFile);
-    ExtAudioFileGetProperty(self.inputFile, kExtAudioFileProperty_FileLengthFrames, &propertySize, &framesInThisFile);
-    
-    AudioStreamBasicDescription fileStreamFormat;
-    propertySize = sizeof(AudioStreamBasicDescription);
-    ExtAudioFileGetProperty(self.inputFile, kExtAudioFileProperty_FileDataFormat, &propertySize, &fileStreamFormat);
-    
-    return (float)framesInThisFile/(float)fileStreamFormat.mSampleRate;
-    
-}
-
-- (void)configureReaderCallback
-{
-    if (!self.callbackTimer)
-    {
-        self.callbackTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
-        UInt32 numSamplesPerCallback = (UInt32)( self.latency * self.samplingRate );
-        dispatch_source_set_timer(self.callbackTimer, dispatch_walltime(NULL, 0), self.latency*NSEC_PER_SEC, 0);
-        dispatch_source_set_event_handler(self.callbackTimer, ^{
-            
-            if (self.playing) {
-            
-                if (self.readerBlock) {
-                    // Suck some audio down from our ring buffer
-                    [self retrieveFreshAudio:self.holdingBuffer numFrames:numSamplesPerCallback numChannels:self.numChannels];
-                
-                    // Call out with the audio that we've got.
-                    self.readerBlock(self.holdingBuffer, numSamplesPerCallback, self.numChannels);
-                }
-                
-                // Asynchronously fill up the buffer (if it needs filling)
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    [self bufferNewAudio];
-                });
-                
-            }
-            
-         });
-        
-        dispatch_resume(self.callbackTimer);
-    }
-}
-
-
-- (void)retrieveFreshAudio:(float *)buffer numFrames:(UInt32)thisNumFrames numChannels:(UInt32)thisNumChannels
-{
-    ringBuffer->FetchInterleavedData(buffer, thisNumFrames, thisNumChannels);
-}
-
-
-- (void)play
-{
-
-    // Configure (or if necessary, create and start) the timer for retrieving audio
-    if (!self.playing) {
-        [self configureReaderCallback];
-        self.playing = TRUE;
-    }
-
-}
-
-- (void)pause
-{
-    // Pause the dispatch timer for retrieving the MP3 audio
-    self.playing = FALSE;
-}
-
-- (void)stop
-{
-    // Release the dispatch timer because it holds a reference to this class instance
-    [self pause];
-    if (self.callbackTimer) {
-#if NEEDS_DISPATCH_RETAIN_RELEASE
-        dispatch_release(self.callbackTimer);
-#endif
-        self.callbackTimer = nil;
-    }
-}
-
-
-@end
diff --git a/Novocaine iOS Example/Novocaine/AudioFileWriter.h b/Novocaine iOS Example/Novocaine/AudioFileWriter.h
deleted file mode 100644
index bdacd49..0000000
--- a/Novocaine iOS Example/Novocaine/AudioFileWriter.h	
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-//  AudioFileWriter.h
-//  Novocaine
-//
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-#import <Foundation/Foundation.h>
-#import "Novocaine.h"
-
-
-@interface AudioFileWriter : NSObject
-
-// ----- Read-write ------
-@property (nonatomic, copy) NovocaineInputBlock writerBlock;
-
-// ----- Read-only ------
-@property (nonatomic, assign, getter=getDuration, readonly) float currentTime;
-@property (nonatomic, assign, getter=getDuration, readonly) float duration;
-@property (nonatomic, assign, readonly) float samplingRate;
-@property (nonatomic, assign, readonly) UInt32 numChannels;
-@property (nonatomic, assign, readonly) float latency;
-@property (nonatomic, copy, readonly)   NSURL *audioFileURL;
-@property (nonatomic, assign, readonly) BOOL recording;
-
-
-- (id)initWithAudioFileURL:(NSURL *)urlToAudioFile samplingRate:(float)thisSamplingRate numChannels:(UInt32)thisNumChannels;
-
-// You use this method to grab audio if you have your own callback.
-// The buffer'll fill at the speed the audio is normally being played.
-- (void)writeNewAudio:(float *)newData numFrames:(UInt32)thisNumFrames numChannels:(UInt32)thisNumChannels;
-
-- (void)record;
-- (void)pause;
-
-
-@end
diff --git a/Novocaine iOS Example/Novocaine/AudioFileWriter.m b/Novocaine iOS Example/Novocaine/AudioFileWriter.m
deleted file mode 100644
index c2c0236..0000000
--- a/Novocaine iOS Example/Novocaine/AudioFileWriter.m	
+++ /dev/null
@@ -1,232 +0,0 @@
-//
-//  AudioFileWriter.m
-//  Novocaine
-//
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-#import "AudioFileWriter.h"
-#import <pthread.h>
-
-@interface AudioFileWriter()
-
-// redeclare as readwrite in class continuation
-@property (nonatomic, assign, getter=getDuration, readwrite) float currentTime;
-@property (nonatomic, assign, getter=getDuration, readwrite) float duration;
-@property (nonatomic, assign, readwrite) float samplingRate;
-@property (nonatomic, assign, readwrite) UInt32 numChannels;
-@property (nonatomic, assign, readwrite) float latency;
-@property (nonatomic, copy, readwrite)   NSURL *audioFileURL;
-@property (nonatomic, assign, readwrite) BOOL recording;
-
-@property (nonatomic, assign) AudioStreamBasicDescription outputFormat;
-@property (nonatomic, assign) ExtAudioFileRef outputFile;
-@property (nonatomic, assign) UInt32 outputBufferSize;
-@property (nonatomic, assign) float *outputBuffer;
-@property (nonatomic, assign) float *holdingBuffer;
-@property (nonatomic, assign) SInt64 currentFileTime;
-@property (nonatomic, assign) dispatch_source_t callbackTimer;
-
-@end
-
-
-@implementation AudioFileWriter
-
-static pthread_mutex_t outputAudioFileLock;
-
-- (void)dealloc
-{
-    [self stop];
-    
-    free(self.outputBuffer);
-    free(self.holdingBuffer);
-    
-}
-
-- (id)initWithAudioFileURL:(NSURL *)urlToAudioFile samplingRate:(float)thisSamplingRate numChannels:(UInt32)thisNumChannels
-{
-    self = [super init];
-    if (self)
-    {
-        
-        // Zero-out our timer, so we know we're not using our callback yet
-        self.callbackTimer = nil;
-        
-        
-        // Open a reference to the audio file
-        self.audioFileURL = urlToAudioFile;
-        CFURLRef audioFileRef = (__bridge CFURLRef)self.audioFileURL;
-        
-        AudioStreamBasicDescription outputFileDesc = {44100.0, kAudioFormatMPEG4AAC, 0, 0, 1024, 0, thisNumChannels, 0, 0};
-        
-        CheckError(ExtAudioFileCreateWithURL(audioFileRef, kAudioFileM4AType, &outputFileDesc, NULL, kAudioFileFlags_EraseFile, &_outputFile), "Creating file");
-        
-        
-        // Set a few defaults and presets
-        self.samplingRate = thisSamplingRate;
-        self.numChannels = thisNumChannels;
-        self.currentTime = 0.0;
-        self.latency = .011609977; // 512 samples / ( 44100 samples / sec ) default
-        
-        
-        // We're going to impose a format upon the input file
-        // Single-channel float does the trick.
-        _outputFormat.mSampleRate = self.samplingRate;
-        _outputFormat.mFormatID = kAudioFormatLinearPCM;
-        _outputFormat.mFormatFlags = kAudioFormatFlagIsFloat;
-        _outputFormat.mBytesPerPacket = 4*self.numChannels;
-        _outputFormat.mFramesPerPacket = 1;
-        _outputFormat.mBytesPerFrame = 4*self.numChannels;
-        _outputFormat.mChannelsPerFrame = self.numChannels;
-        _outputFormat.mBitsPerChannel = 32;
-        
-        // Apply the format to our file
-        ExtAudioFileSetProperty(_outputFile, kExtAudioFileProperty_ClientDataFormat, sizeof(AudioStreamBasicDescription), &_outputFormat);
-        
-        
-        // Arbitrary buffer sizes that don't matter so much as long as they're "big enough"
-        self.outputBuffer = (float *)calloc(2*self.samplingRate, sizeof(float));
-        self.holdingBuffer = (float *)calloc(2*self.samplingRate, sizeof(float));
-        
-        pthread_mutex_init(&outputAudioFileLock, NULL);
-        
-        // mutex here //
-        if( 0 == pthread_mutex_trylock( &outputAudioFileLock ) ) 
-        {       
-            CheckError( ExtAudioFileWriteAsync(self.outputFile, 0, NULL), "Initializing audio file");
-        }
-        pthread_mutex_unlock( &outputAudioFileLock );
-        
-    }
-    return self;
-}
-
-- (void)writeNewAudio:(float *)newData numFrames:(UInt32)thisNumFrames numChannels:(UInt32)thisNumChannels
-{
-    UInt32 numIncomingBytes = thisNumFrames*thisNumChannels*sizeof(float);
-    memcpy(self.outputBuffer, newData, numIncomingBytes);
-    
-    AudioBufferList outgoingAudio;
-    outgoingAudio.mNumberBuffers = 1;
-    outgoingAudio.mBuffers[0].mNumberChannels = thisNumChannels;
-    outgoingAudio.mBuffers[0].mDataByteSize = numIncomingBytes;
-    outgoingAudio.mBuffers[0].mData = self.outputBuffer;
-    
-    if( 0 == pthread_mutex_trylock( &outputAudioFileLock ) ) 
-    {       
-        ExtAudioFileWriteAsync(self.outputFile, thisNumFrames, &outgoingAudio);
-    }
-    pthread_mutex_unlock( &outputAudioFileLock );
-    
-    // Figure out where we are in the file
-    SInt64 frameOffset = 0;
-    ExtAudioFileTell(self.outputFile, &frameOffset);
-    self.currentTime = (float)frameOffset / self.samplingRate;
-    
-}
-
-
-- (float)getDuration
-{
-    // We're going to directly calculate the duration of the audio file (in seconds)
-    SInt64 framesInThisFile;
-    UInt32 propertySize = sizeof(framesInThisFile);
-    ExtAudioFileGetProperty(self.outputFile, kExtAudioFileProperty_FileLengthFrames, &propertySize, &framesInThisFile);
-    
-    AudioStreamBasicDescription fileStreamFormat;
-    propertySize = sizeof(AudioStreamBasicDescription);
-    ExtAudioFileGetProperty(self.outputFile, kExtAudioFileProperty_FileDataFormat, &propertySize, &fileStreamFormat);
-    
-    return (float)framesInThisFile/(float)fileStreamFormat.mSampleRate;
-    
-}
-
-
-
-- (void)configureWriterCallback
-{
-    
-    if (!self.callbackTimer)
-    {
-        self.callbackTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
-    }
-    
-    if (self.callbackTimer)
-    {
-        UInt32 numSamplesPerCallback = (UInt32)( self.latency * self.samplingRate );
-        dispatch_source_set_timer(self.callbackTimer, dispatch_walltime(NULL, 0), self.latency*NSEC_PER_SEC, 0);
-        dispatch_source_set_event_handler(self.callbackTimer, ^{
-            
-            
-            if (self.writerBlock) {                
-                // Call out with the audio that we've got.
-                self.writerBlock(self.outputBuffer, numSamplesPerCallback, self.numChannels);
-                
-                // Get audio from the block supplier
-                [self writeNewAudio:self.outputBuffer numFrames:numSamplesPerCallback numChannels:self.numChannels];
-                
-            }
-            
-        });
-        
-    }
-    
-}
-
-
-
-- (void)record;
-{
-    
-    // Configure (or if necessary, create and start) the timer for retrieving MP3 audio
-    [self configureWriterCallback];
-    
-    if (!self.recording)
-    {
-        dispatch_resume(self.callbackTimer);
-        self.recording = TRUE;
-    }
-    
-}
-
-- (void)stop
-{
-    // Close the
-    pthread_mutex_lock( &outputAudioFileLock );
-    ExtAudioFileDispose(self.outputFile);
-    pthread_mutex_unlock( &outputAudioFileLock );
-    self.recording = FALSE;
-}
-
-- (void)pause
-{
-    // Pause the dispatch timer for retrieving the MP3 audio
-    if (self.callbackTimer) {
-        dispatch_suspend(self.callbackTimer);
-        self.recording = FALSE;
-    }
-}
-
-
-
-@end
-
diff --git a/Novocaine iOS Example/Novocaine/Novocaine.h b/Novocaine iOS Example/Novocaine/Novocaine.h
deleted file mode 100644
index a5a99a1..0000000
--- a/Novocaine iOS Example/Novocaine/Novocaine.h	
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-#import <CoreFoundation/CoreFoundation.h>
-#import <AudioToolbox/AudioToolbox.h>
-#import <Accelerate/Accelerate.h>
-
-#if defined __MAC_OS_X_VERSION_MAX_ALLOWED
-    #define USING_OSX 
-    #include <CoreAudio/CoreAudio.h>
-#else
-    #define USING_IOS
-    #include <AVFoundation/AVFoundation.h>
-#endif
-
-#if defined (USING_IOS)
-    #import <UIKit/UIKit.h>
-#endif
-
-#include <Block.h>
-
-FOUNDATION_EXTERN void CheckError(OSStatus error, const char *operation);
-
-typedef void (^NovocaineOutputBlock)(float *data, UInt32 numFrames, UInt32 numChannels);
-typedef void (^NovocaineInputBlock)(float *data, UInt32 numFrames, UInt32 numChannels);
-
-#if defined (USING_IOS)
-@interface Novocaine : NSObject <UIAlertViewDelegate>
-#elif defined (USING_OSX)
-@interface Novocaine : NSObject
-#endif
-
-// ------ These properties/methods are used for configuration -------
-
-@property (nonatomic, copy)     NSString *inputRoute;
-
-// TODO: Not yet implemented. No effect right now.
-//@property (nonatomic, assign)   BOOL inputEnabled;
-
-#ifdef USING_IOS
-@property (nonatomic, assign)   BOOL forceOutputToSpeaker;
-#endif
-
-// Explicitly declaring the block setters will create the correct block signature for auto-complete.
-// These will map to the setters for the block properties below.
-- (void)setInputBlock:(NovocaineInputBlock)block;
-- (void)setOutputBlock:(NovocaineOutputBlock)block;
-
-@property (nonatomic, copy) NovocaineOutputBlock outputBlock;
-@property (nonatomic, copy) NovocaineInputBlock inputBlock;
-
-// ------------------------------------------------------------------
-
-// these should be readonly in public interface - no need for public write access
-@property (nonatomic, assign, readonly) AudioUnit inputUnit;
-@property (nonatomic, assign, readonly) AudioUnit outputUnit;
-@property (nonatomic, assign, readonly) AudioBufferList *inputBuffer;
-@property (nonatomic, assign, readonly) BOOL inputAvailable;
-@property (nonatomic, assign, readonly) UInt32 numInputChannels;
-@property (nonatomic, assign, readonly) UInt32 numOutputChannels;
-@property (nonatomic, assign, readonly) Float64 samplingRate;
-@property (nonatomic, assign, readonly) BOOL isInterleaved;
-@property (nonatomic, assign, readonly) UInt32 numBytesPerSample;
-@property (nonatomic, assign, readonly) AudioStreamBasicDescription inputFormat;
-@property (nonatomic, assign, readonly) AudioStreamBasicDescription outputFormat;
-@property (nonatomic, assign, readonly) BOOL playing;
-
-// @property BOOL playThroughEnabled;
-
-
-// Singleton methods
-+ (Novocaine *) audioManager;
-
-// Audio Unit methods
-- (void)play;
-- (void)pause;
-
-#if defined ( USING_IOS )
-- (void)checkSessionProperties;
-- (void)checkAudioSource;
-#endif
-
-
-@end
diff --git a/Novocaine iOS Example/Novocaine/Novocaine.m b/Novocaine iOS Example/Novocaine/Novocaine.m
deleted file mode 100644
index 3161d73..0000000
--- a/Novocaine iOS Example/Novocaine/Novocaine.m	
+++ /dev/null
@@ -1,1021 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-// TODO:
-// Switching mic and speaker on/off
-//
-// HOUSEKEEPING AND NICE FEATURES:
-// Disambiguate outputFormat (the AUHAL's stream format)
-// More nuanced input detection on the Mac
-// Route switching should work, check with iPhone
-// Device switching should work, check with laptop. Read that damn book.
-// Wrap logging with debug macros.
-// Think about what should be public, what private.
-// Ability to select non-default devices.
-
-
-#import "Novocaine.h"
-#define kInputBus 1
-#define kOutputBus 0
-#define kDefaultDevice 999999
-
-#import "TargetConditionals.h"
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	
-    void CheckError(OSStatus error, const char *operation)
-    {
-        if (error == noErr) return;
-        
-        char str[20];
-        // see if it appears to be a 4-char-code
-        *(UInt32 *)(str + 1) = CFSwapInt32HostToBig(error);
-        if (isprint(str[1]) && isprint(str[2]) && isprint(str[3]) && isprint(str[4])) {
-            str[0] = str[5] = '\'';
-            str[6] = '\0';
-        } else
-            // no, format it as an integer
-            sprintf(str, "%d", (int)error);
-        
-        fprintf(stderr, "Error: %s (%s)\n", operation, str);
-        
-        exit(1);
-    }
-    
-    
-    OSStatus inputCallback (void						*inRefCon,
-                            AudioUnitRenderActionFlags	* ioActionFlags,
-                            const AudioTimeStamp 		* inTimeStamp,
-                            UInt32						inOutputBusNumber,
-                            UInt32						inNumberFrames,
-                            AudioBufferList				* ioData);
-    
-    OSStatus renderCallback (void						*inRefCon,
-                             AudioUnitRenderActionFlags	* ioActionFlags,
-                             const AudioTimeStamp 		* inTimeStamp,
-                             UInt32						inOutputBusNumber,
-                             UInt32						inNumberFrames,
-                             AudioBufferList				* ioData);
-    
-    
-#if defined (USING_IOS)
-    void sessionPropertyListener(void *                  inClientData,
-                                 AudioSessionPropertyID  inID,
-                                 UInt32                  inDataSize,
-                                 const void *            inData);
-    
-#endif
-    
-    
-    void sessionInterruptionListener(void *inClientData, UInt32 inInterruption);
-    
-#ifdef __cplusplus
-}
-#endif
-
-
-
-static Novocaine *audioManager = nil;
-
-@interface Novocaine()
-
-// redeclare readwrite for class continuation
-@property (nonatomic, assign, readwrite) AudioUnit inputUnit;
-@property (nonatomic, assign, readwrite) AudioUnit outputUnit;
-@property (nonatomic, assign, readwrite) AudioBufferList *inputBuffer;
-@property (nonatomic, assign, readwrite) BOOL inputAvailable;
-@property (nonatomic, assign, readwrite) UInt32 numInputChannels;
-@property (nonatomic, assign, readwrite) UInt32 numOutputChannels;
-@property (nonatomic, assign, readwrite) Float64 samplingRate;
-@property (nonatomic, assign, readwrite) BOOL isInterleaved;
-@property (nonatomic, assign, readwrite) UInt32 numBytesPerSample;
-@property (nonatomic, assign, readwrite) AudioStreamBasicDescription inputFormat;
-@property (nonatomic, assign, readwrite) AudioStreamBasicDescription outputFormat;
-@property (nonatomic, assign, readwrite) BOOL playing;
-@property (nonatomic, assign, readwrite) float *inData;
-@property (nonatomic, assign, readwrite) float *outData;
-
-#if defined (USING_OSX)
-@property (nonatomic, assign) AudioDeviceID *deviceIDs;
-@property (nonatomic, strong) NSMutableArray *deviceNames;
-@property (nonatomic, assign) AudioDeviceID defaultInputDeviceID;
-@property (nonatomic, strong) NSString *defaultInputDeviceName;
-@property (nonatomic, assign) AudioDeviceID defaultOutputDeviceID;
-@property (nonatomic, strong) NSString *defaultOutputDeviceName;
-- (void)enumerateAudioDevices;
-#endif
-
-// must be called prior to playing audio
-- (void)setupAudioSession;
-- (void)setupAudioUnits;
-
-- (NSString *)applicationDocumentsDirectory;
-
-- (void)freeBuffers;
-
-@end
-
-
-@implementation Novocaine
-
-#pragma mark - Singleton Methods
-+ (Novocaine *) audioManager
-{
-	@synchronized(self)
-	{
-		if (audioManager == nil) {
-			audioManager = [[Novocaine alloc] init];
-		}
-	}
-    return audioManager;
-}
-
-+ (id)allocWithZone:(NSZone *)zone {
-    @synchronized(self) {
-        if (audioManager == nil) {
-            audioManager = [super allocWithZone:zone];
-            return audioManager;  // assignment and return on first allocation
-        }
-    }
-    return nil; // on subsequent allocation attempts return nil
-}
-
-// ND: If NSCopying protocol is to be supported, it should be declared with class and done correctly. Disabled for now.
-
-//- (id)copyWithZone:(NSZone *)zone
-//{
-//    return self;
-//}
-
-- (id)init
-{
-	if (self = [super init])
-	{
-        
-        // Initialize a float buffer to hold audio
-		self.inData  = (float *)calloc(8192, sizeof(float)); // probably more than we'll need
-        self.outData = (float *)calloc(8192, sizeof(float));
-        
-        self.inputBlock = nil;
-        self.outputBlock = nil;
-        
-#if defined ( USING_OSX )
-        self.deviceNames = [[NSMutableArray alloc] initWithCapacity:100]; // more than we'll need
-#endif
-        
-        self.playing = NO;
-        // self.playThroughEnabled = NO;
-		
-		// Fire up the audio session ( with steady error checking ... )
-        [self setupAudioSession];
-        
-        // start audio units
-        [self setupAudioUnits];
-		
-		return self;
-		
-	}
-	
-	return nil;
-}
-
-- (void)dealloc
-{
-    free(self.inData);
-    free(self.outData);
-    
-#if defined (USING_OSX)
-    if (self.deviceIDs){
-        free(self.deviceIDs);
-    }
-#endif
-    
-    [self freeBuffers];
-}
-
-- (void)freeBuffers
-{
-    if (self.inputBuffer){
-        
-		for(UInt32 i =0; i< self.inputBuffer->mNumberBuffers ; i++) {
-
-			if(self.inputBuffer->mBuffers[i].mData){
-                free(self.inputBuffer->mBuffers[i].mData);
-            }
-		}
-        
-        free(self.inputBuffer);
-        self.inputBuffer = NULL;
-    }
-}
-
-#pragma mark - Properties
-
-// TODO: Implement this.
-//- (void)setInputEnabled:(BOOL)inputEnabled
-//{
-//    _inputEnabled = inputEnabled;
-//}
-
-#ifdef USING_IOS
-- (void)setForceOutputToSpeaker:(BOOL)forceOutputToSpeaker
-{
-    
-#if !TARGET_IPHONE_SIMULATOR
-    UInt32 value = forceOutputToSpeaker ? 1 : 0;
-    // should not be fatal error
-    OSStatus err = AudioSessionSetProperty(kAudioSessionProperty_OverrideCategoryDefaultToSpeaker, sizeof(UInt32), &value);
-    if (err != noErr){
-        NSLog(@"Could not override audio output route to speaker");
-    }
-    else{
-        _forceOutputToSpeaker = forceOutputToSpeaker;
-    }
-#else
-    _forceOutputToSpeaker = forceOutputToSpeaker;
-#endif
-}
-#endif
-
-#pragma mark - Audio Methods
-
-
-- (void)setupAudioSession
-{
-    // Initialize and configure the audio session, and add an interuption listener
-    
-#if defined ( USING_IOS )
-    
-    // Set the audio session active
-    NSError *err = nil;
-    if (![[AVAudioSession sharedInstance] setActive:YES error:&err]){
-        NSLog(@"Couldn't activate audio session: %@", err);
-    }
-    [self checkAudioSource];
-#elif defined ( USING_OSX )
-    // TODO: grab the audio device
-    [self enumerateAudioDevices];
-    self.inputAvailable = YES;
-#endif
-}
-
-
-- (void)setupAudioUnits
-{
-    
-    // --- Audio Session Setup ---
-    // ---------------------------
-    
-#if defined ( USING_IOS )
-    
-    // TODO: Move this somewhere more dynamic - should update category as appropriate to current application behavior
-    UInt32 sessionCategory = kAudioSessionCategory_PlayAndRecord;
-    CheckError( AudioSessionSetProperty (kAudioSessionProperty_AudioCategory,
-                                         sizeof (sessionCategory),
-                                         &sessionCategory), "Couldn't set audio category");    
-    
-    
-    // Add a property listener, to listen to changes to the session
-    CheckError( AudioSessionAddPropertyListener(kAudioSessionProperty_AudioRouteChange, sessionPropertyListener, (__bridge void*)self), "Couldn't add audio session property listener");
-    
-    // Set the buffer size, this will affect the number of samples that get rendered every time the audio callback is fired
-    // A small number will get you lower latency audio, but will make your processor work harder
-#if !TARGET_IPHONE_SIMULATOR
-    Float32 preferredBufferSize = 0.0232;
-    CheckError( AudioSessionSetProperty(kAudioSessionProperty_PreferredHardwareIOBufferDuration, sizeof(preferredBufferSize), &preferredBufferSize), "Couldn't set the preferred buffer duration");
-#endif
-
-    
-    [self checkSessionProperties];
-    
-#endif
-    
-    // ----- Audio Unit Setup -----
-    // ----------------------------
-    
-    
-    // Describe the output unit.
-    
-#if defined ( USING_OSX )
-    AudioComponentDescription inputDescription = {0};	
-    inputDescription.componentType = kAudioUnitType_Output;
-    inputDescription.componentSubType = kAudioUnitSubType_HALOutput;
-    inputDescription.componentManufacturer = kAudioUnitManufacturer_Apple;
-    
-    AudioComponentDescription outputDescription = {0};	
-    outputDescription.componentType = kAudioUnitType_Output;
-    outputDescription.componentSubType = kAudioUnitSubType_HALOutput;
-    outputDescription.componentManufacturer = kAudioUnitManufacturer_Apple;    
-    
-#elif defined (USING_IOS)
-    AudioComponentDescription inputDescription = {0};	
-    inputDescription.componentType = kAudioUnitType_Output;
-    inputDescription.componentSubType = kAudioUnitSubType_RemoteIO;
-    inputDescription.componentManufacturer = kAudioUnitManufacturer_Apple;
-    
-#endif
-    
-    
-    
-    // Get component
-    AudioComponent inputComponent = AudioComponentFindNext(NULL, &inputDescription);
-    CheckError( AudioComponentInstanceNew(inputComponent, &_inputUnit), "Couldn't create the output audio unit");
-    
-#if defined ( USING_OSX )
-    AudioComponent outputComponent = AudioComponentFindNext(NULL, &outputDescription);
-    CheckError( AudioComponentInstanceNew(outputComponent, &_outputUnit), "Couldn't create the output audio unit");
-#endif
-    
-    // Enable input
-    // TODO: Conditionally disable input if option has not been specified
-    UInt32 one = 1;
-    CheckError( AudioUnitSetProperty(_inputUnit,
-                                     kAudioOutputUnitProperty_EnableIO,
-                                     kAudioUnitScope_Input,
-                                     kInputBus,
-                                     &one,
-                                     sizeof(one)), "Couldn't enable IO on the input scope of output unit");
-    
-    
-#if defined ( USING_OSX )    
-    // Disable output on the input unit
-    // (only on Mac, since on the iPhone, the input unit is also the output unit)
-    UInt32 zero = 0;
-    CheckError( AudioUnitSetProperty(_inputUnit,
-                                     kAudioOutputUnitProperty_EnableIO, 
-                                     kAudioUnitScope_Output, 
-                                     kOutputBus, 
-                                     &zero, 
-                                     sizeof(UInt32)), "Couldn't disable output on the audio unit");
-    
-    // Enable output
-    CheckError( AudioUnitSetProperty(_outputUnit,
-                                     kAudioOutputUnitProperty_EnableIO, 
-                                     kAudioUnitScope_Output, 
-                                     kOutputBus, 
-                                     &one, 
-                                     sizeof(one)), "Couldn't enable IO on the input scope of output unit");
-    
-    // Disable input
-    CheckError( AudioUnitSetProperty(_outputUnit,
-                                     kAudioOutputUnitProperty_EnableIO, 
-                                     kAudioUnitScope_Input, 
-                                     kInputBus, 
-                                     &zero, 
-                                     sizeof(UInt32)), "Couldn't disable output on the audio unit");
-    
-#endif
-    
-    // TODO: first query the hardware for desired stream descriptions
-    // Check the input stream format
-    
-# if defined ( USING_IOS )
-    UInt32 size;
-	size = sizeof( AudioStreamBasicDescription );
-	CheckError( AudioUnitGetProperty(_inputUnit,
-                                     kAudioUnitProperty_StreamFormat, 
-                                     kAudioUnitScope_Input, 
-                                     1, 
-                                     &_inputFormat,
-                                     &size ),
-               "Couldn't get the hardware input stream format");
-	
-	// Check the output stream format
-	size = sizeof( AudioStreamBasicDescription );
-	CheckError( AudioUnitGetProperty(_inputUnit,
-                                     kAudioUnitProperty_StreamFormat, 
-                                     kAudioUnitScope_Output, 
-                                     1, 
-                                     &_outputFormat,
-                                     &size ), 
-               "Couldn't get the hardware output stream format");
-    
-    // TODO: check this works on iOS!
-    _inputFormat.mSampleRate = 44100.0;
-    _outputFormat.mSampleRate = 44100.0;
-    self.samplingRate = _inputFormat.mSampleRate;
-    self.numBytesPerSample = _inputFormat.mBitsPerChannel / 8;
-    
-    size = sizeof(AudioStreamBasicDescription);
-	CheckError(AudioUnitSetProperty(_inputUnit,
-									kAudioUnitProperty_StreamFormat,
-									kAudioUnitScope_Output,
-									kInputBus,
-									&_outputFormat,
-									size),
-			   "Couldn't set the ASBD on the audio unit (after setting its sampling rate)");
-    
-    
-# elif defined ( USING_OSX )
-    
-    UInt32 size = sizeof(AudioDeviceID);
-    if(self.defaultInputDeviceID == kAudioDeviceUnknown)
-    {
-        AudioObjectPropertyAddress propertyAddress;
-        propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice;
-        propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-        propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-        
-        AudioDeviceID thisDeviceID;            
-        UInt32 propsize = sizeof(AudioDeviceID);
-        CheckError(AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propsize, &thisDeviceID), "Could not get the default device");
-        self.defaultInputDeviceID = thisDeviceID;
-    }
-    
-    if (self.defaultOutputDeviceID == kAudioDeviceUnknown)
-    {
-        AudioObjectPropertyAddress propertyAddress;
-        propertyAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
-        propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-        propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-        
-        AudioDeviceID thisDeviceID;            
-        UInt32 propsize = sizeof(AudioDeviceID);
-        CheckError(AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propsize, &thisDeviceID), "Could not get the default device");
-        self.defaultOutputDeviceID = thisDeviceID;
-        
-    }
-    
-    
-    // Set the current device to the default input unit.
-    CheckError( AudioUnitSetProperty( _inputUnit, 
-                                     kAudioOutputUnitProperty_CurrentDevice, 
-                                     kAudioUnitScope_Global, 
-                                     kOutputBus, 
-                                     &_defaultInputDeviceID,
-                                     sizeof(AudioDeviceID) ), "Couldn't set the current input audio device");
-    
-    CheckError( AudioUnitSetProperty( _outputUnit,
-                                     kAudioOutputUnitProperty_CurrentDevice, 
-                                     kAudioUnitScope_Global, 
-                                     kOutputBus, 
-                                     &_defaultOutputDeviceID,
-                                     sizeof(AudioDeviceID) ), "Couldn't set the current output audio device");
-    
-    
-	UInt32 propertySize = sizeof(AudioStreamBasicDescription);
-	CheckError(AudioUnitGetProperty(_inputUnit,
-									kAudioUnitProperty_StreamFormat,
-									kAudioUnitScope_Output,
-									kInputBus,
-									&_outputFormat,
-									&propertySize),
-			   "Couldn't get ASBD from input unit");
-    
-    
-	// 9/6/10 - check the input device's stream format
-	CheckError(AudioUnitGetProperty(_inputUnit,
-									kAudioUnitProperty_StreamFormat,
-									kAudioUnitScope_Input,
-									kInputBus,
-									&_inputFormat,
-									&propertySize),
-			   "Couldn't get ASBD from input unit");
-    
-    
-    _outputFormat.mSampleRate = _inputFormat.mSampleRate;
-//    outputFormat.mFormatFlags =  kAudioFormatFlagsCanonical;
-    self.samplingRate = _inputFormat.mSampleRate;
-    self.numBytesPerSample = _inputFormat.mBitsPerChannel / 8;
-    
-    self.numInputChannels = _inputFormat.mChannelsPerFrame;
-    self.numOutputChannels = _outputFormat.mChannelsPerFrame;
-    
-    propertySize = sizeof(AudioStreamBasicDescription);
-	CheckError(AudioUnitSetProperty(_inputUnit,
-									kAudioUnitProperty_StreamFormat,
-									kAudioUnitScope_Output,
-									kInputBus,
-									&_outputFormat,
-									propertySize),
-			   "Couldn't set the ASBD on the audio unit (after setting its sampling rate)");
-    
-    
-#endif
-    
-    
-    
-#if defined ( USING_IOS )
-    UInt32 numFramesPerBuffer;
-    size = sizeof(UInt32);
-    CheckError(AudioUnitGetProperty(_inputUnit,
-                                    kAudioUnitProperty_MaximumFramesPerSlice,
-                                    kAudioUnitScope_Global, 
-                                    kOutputBus, 
-                                    &numFramesPerBuffer, 
-                                    &size), 
-               "Couldn't get the number of frames per callback");
-    
-    UInt32 bufferSizeBytes = _outputFormat.mBytesPerFrame * _outputFormat.mFramesPerPacket * numFramesPerBuffer;
-    
-#elif defined ( USING_OSX )
-	// Get the size of the IO buffer(s)
-	UInt32 bufferSizeFrames = 0;
-	size = sizeof(UInt32);
-	CheckError (AudioUnitGetProperty(self.inputUnit,
-									 kAudioDevicePropertyBufferFrameSize,
-									 kAudioUnitScope_Global,
-									 0,
-									 &bufferSizeFrames,
-									 &size),
-				"Couldn't get buffer frame size from input unit");
-	UInt32 bufferSizeBytes = bufferSizeFrames * sizeof(Float32);
-#endif
-    
-    
-    
-	if (_outputFormat.mFormatFlags & kAudioFormatFlagIsNonInterleaved) {
-        // The audio is non-interleaved
-        printf("Not interleaved!\n");
-        self.isInterleaved = NO;
-        
-        // allocate an AudioBufferList plus enough space for array of AudioBuffers
-		UInt32 propsize = offsetof(AudioBufferList, mBuffers[0]) + (sizeof(AudioBuffer) * _outputFormat.mChannelsPerFrame);
-		
-		//malloc buffer lists
-		self.inputBuffer = (AudioBufferList *)malloc(propsize);
-		self.inputBuffer->mNumberBuffers = _outputFormat.mChannelsPerFrame;
-		
-		//pre-malloc buffers for AudioBufferLists
-		for(UInt32 i =0; i< self.inputBuffer->mNumberBuffers ; i++) {
-			self.inputBuffer->mBuffers[i].mNumberChannels = 1;
-			self.inputBuffer->mBuffers[i].mDataByteSize = bufferSizeBytes;
-			self.inputBuffer->mBuffers[i].mData = malloc(bufferSizeBytes);
-            memset(self.inputBuffer->mBuffers[i].mData, 0, bufferSizeBytes);
-		}
-        
-	} else {
-		printf ("Format is interleaved\n");
-        self.isInterleaved = YES;
-        
-		// allocate an AudioBufferList plus enough space for array of AudioBuffers
-		UInt32 propsize = offsetof(AudioBufferList, mBuffers[0]) + (sizeof(AudioBuffer) * 1);
-		
-		//malloc buffer lists
-		self.inputBuffer = (AudioBufferList *)malloc(propsize);
-		self.inputBuffer->mNumberBuffers = 1;
-		
-		//pre-malloc buffers for AudioBufferLists
-		self.inputBuffer->mBuffers[0].mNumberChannels = _outputFormat.mChannelsPerFrame;
-		self.inputBuffer->mBuffers[0].mDataByteSize = bufferSizeBytes;
-		self.inputBuffer->mBuffers[0].mData = malloc(bufferSizeBytes);
-        memset(self.inputBuffer->mBuffers[0].mData, 0, bufferSizeBytes);
-        
-	}
-    
-    
-    // Slap a render callback on the unit
-    AURenderCallbackStruct callbackStruct;
-    callbackStruct.inputProc = inputCallback;
-    callbackStruct.inputProcRefCon = (__bridge void *)(self);
-    
-    CheckError( AudioUnitSetProperty(_inputUnit,
-                                     kAudioOutputUnitProperty_SetInputCallback, 
-                                     kAudioUnitScope_Global,
-                                     0, 
-                                     &callbackStruct, 
-                                     sizeof(callbackStruct)), "Couldn't set the callback on the input unit");
-    
-    
-    callbackStruct.inputProc = renderCallback;
-    callbackStruct.inputProcRefCon = (__bridge void *)(self);
-# if defined ( USING_OSX )    
-    CheckError( AudioUnitSetProperty(_outputUnit,
-                                     kAudioUnitProperty_SetRenderCallback, 
-                                     kAudioUnitScope_Input,
-                                     0,
-                                     &callbackStruct, 
-                                     sizeof(callbackStruct)), 
-               "Couldn't set the render callback on the input unit");
-    
-#elif defined ( USING_IOS )
-    CheckError( AudioUnitSetProperty(_inputUnit,
-                                     kAudioUnitProperty_SetRenderCallback, 
-                                     kAudioUnitScope_Input,
-                                     0,
-                                     &callbackStruct, 
-                                     sizeof(callbackStruct)), 
-               "Couldn't set the render callback on the input unit");    
-#endif
-    
-    
-    
-    
-	CheckError(AudioUnitInitialize(_inputUnit), "Couldn't initialize the output unit");
-#if defined ( USING_OSX )
-    CheckError(AudioUnitInitialize(_outputUnit), "Couldn't initialize the output unit");
-#endif
-    
-}
-
-#if defined (USING_OSX)
-- (void)enumerateAudioDevices
-{
-    AudioObjectPropertyAddress propertyAddress;
-    propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice;
-    propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-    propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-    
-    UInt32 propSize = sizeof(AudioDeviceID);
-    CheckError(AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propSize, &_defaultInputDeviceID), "Could not get the default device");
-    
-    propertyAddress.mSelector = kAudioHardwarePropertyDevices;
-    propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-    propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-    
-    AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propSize);
-    uint32_t deviceCount = ( propSize / sizeof(AudioDeviceID) );
-    
-    // Allocate the device IDs
-    _deviceIDs = (AudioDeviceID *)calloc(deviceCount, sizeof(AudioDeviceID));
-    [_deviceNames removeAllObjects];
-    
-    // Get all the device IDs
-    CheckError( AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propSize, _deviceIDs ), "Could not get device IDs");
-    
-    
-    // Get the names of all the device IDs
-    // 256 chars should be big enough for pretty much any name
-    char deviceNameBuffer[256];
-    char mfrNameBuffer[256];
-    UInt32 nameBufSize;
-    AudioObjectPropertyAddress deviceAddress;
-    
-    for( int i = 0; i < deviceCount; i++ )
-    {
-        deviceAddress.mSelector = kAudioDevicePropertyDeviceName;
-        deviceAddress.mScope = kAudioObjectPropertyScopeGlobal;
-        deviceAddress.mElement = kAudioObjectPropertyElementMaster;
-        
-        nameBufSize = sizeof(deviceNameBuffer);
-        
-        CheckError( AudioObjectGetPropertyData(self.deviceIDs[i], &deviceAddress, 0, NULL, &nameBufSize, deviceNameBuffer), "Could not get device name");
-
-        deviceAddress.mSelector = kAudioDevicePropertyDeviceManufacturer;
-        deviceAddress.mScope = kAudioObjectPropertyScopeGlobal;
-        deviceAddress.mElement = kAudioObjectPropertyElementMaster;
-        
-        nameBufSize = sizeof(mfrNameBuffer);
-        
-        CheckError( AudioObjectGetPropertyData(self.deviceIDs[i], &deviceAddress, 0, NULL, &nameBufSize, mfrNameBuffer), "Could not get device manufacturer");
-        
-        NSString *thisDeviceName = [NSString stringWithFormat:@"%@: %@", [NSString stringWithUTF8String:mfrNameBuffer], [NSString stringWithUTF8String:deviceNameBuffer]];
-        NSLog(@"Device: %@, ID: %d", thisDeviceName, self.deviceIDs[i]);
-        [self.deviceNames addObject:thisDeviceName];
-    }
-    
-}
-
-#endif
-
-
-
-- (void)pause {
-	
-	if (self.playing) {
-        CheckError( AudioOutputUnitStop(_inputUnit), "Couldn't stop the output unit");
-#if defined ( USING_OSX )
-		CheckError( AudioOutputUnitStop(_outputUnit), "Couldn't stop the output unit");
-#endif
-		self.playing = NO;
-	}
-    
-}
-
-- (void)play {
-	
-	UInt32 isInputAvailable=0;
-    
-#if defined ( USING_IOS )
-    UInt32 size = sizeof(isInputAvailable);
-	CheckError( AudioSessionGetProperty(kAudioSessionProperty_AudioInputAvailable, 
-                                        &size, 
-                                        &isInputAvailable), "Couldn't check if input was available");
-    
-#elif defined ( USING_OSX )
-    isInputAvailable = 1;
-    
-#endif
-    
-    self.inputAvailable = isInputAvailable;
-    
-	if ( self.inputAvailable ) {
-		// Set the audio session category for simultaneous play and record
-		if (!self.playing) {
-			CheckError( AudioOutputUnitStart(_inputUnit), "Couldn't start the output unit");
-#if defined ( USING_OSX )
-            CheckError( AudioOutputUnitStart(_outputUnit), "Couldn't start the output unit");
-#endif
-            
-            self.playing = YES;
-            
-		}
-	}
-    
-}
-
-
-#pragma mark - Render Methods
-OSStatus inputCallback   (void						*inRefCon,
-                          AudioUnitRenderActionFlags	* ioActionFlags,
-                          const AudioTimeStamp 		* inTimeStamp,
-                          UInt32						inOutputBusNumber,
-                          UInt32						inNumberFrames,
-                          AudioBufferList			* ioData)
-{
-    @autoreleasepool {
-    
-        Novocaine *sm = (__bridge Novocaine *)inRefCon;
-        
-        if (!sm.playing)
-            return noErr;
-        if (sm.inputBlock == nil)
-            return noErr;    
-        
-        
-        // Check the current number of channels		
-        // Let's actually grab the audio
-#if TARGET_IPHONE_SIMULATOR
-        // this is a workaround for an issue with core audio on the simulator, //
-        //  likely due to 44100 vs 48000 difference in OSX //
-        if( inNumberFrames == 471 )
-            inNumberFrames = 470;
-#endif
-        CheckError( AudioUnitRender(sm.inputUnit, ioActionFlags, inTimeStamp, inOutputBusNumber, inNumberFrames, sm.inputBuffer), "Couldn't render the output unit");
-        
-        
-        // Convert the audio in something manageable
-        // For Float32s ... 
-        if ( sm.numBytesPerSample == 4 ) // then we've already got flaots
-        {
-            
-            float zero = 0.0f;
-            if ( ! sm.isInterleaved ) { // if the data is in separate buffers, make it interleaved
-                for (int i=0; i < sm.numInputChannels; ++i) {
-                    vDSP_vsadd((float *)sm.inputBuffer->mBuffers[i].mData, 1, &zero, sm.inData+i, 
-                               sm.numInputChannels, inNumberFrames);
-                }
-            } 
-            else { // if the data is already interleaved, copy it all in one happy block.
-                // TODO: check mDataByteSize is proper 
-                memcpy(sm.inData, (float *)sm.inputBuffer->mBuffers[0].mData, sm.inputBuffer->mBuffers[0].mDataByteSize);
-            }
-        }
-        
-        // For SInt16s ...
-        else if ( sm.numBytesPerSample == 2 ) // then we're dealing with SInt16's
-        {
-            if ( ! sm.isInterleaved ) {
-                for (int i=0; i < sm.numInputChannels; ++i) {
-                    vDSP_vflt16((SInt16 *)sm.inputBuffer->mBuffers[i].mData, 1, sm.inData+i, sm.numInputChannels, inNumberFrames);
-                }            
-            }
-            else {
-                vDSP_vflt16((SInt16 *)sm.inputBuffer->mBuffers[0].mData, 1, sm.inData, 1, inNumberFrames*sm.numInputChannels);
-            }
-            
-            float scale = 1.0 / (float)INT16_MAX;
-            vDSP_vsmul(sm.inData, 1, &scale, sm.inData, 1, inNumberFrames*sm.numInputChannels);
-        }
-        
-        // Now do the processing! 
-        sm.inputBlock(sm.inData, inNumberFrames, sm.numInputChannels);
-        
-    }
-    
-    return noErr;
-	
-	
-}
-
-OSStatus renderCallback (void						*inRefCon,
-                         AudioUnitRenderActionFlags	* ioActionFlags,
-                         const AudioTimeStamp 		* inTimeStamp,
-                         UInt32						inOutputBusNumber,
-                         UInt32						inNumberFrames,
-                         AudioBufferList				* ioData)
-{
-    // autorelease pool for much faster ARC performance on repeated calls from separate thread
-    @autoreleasepool {
-        
-        Novocaine *sm = (__bridge Novocaine *)inRefCon;
-        float zero = 0.0;
-        
-        
-        for (int iBuffer=0; iBuffer < ioData->mNumberBuffers; ++iBuffer) {
-            memset(ioData->mBuffers[iBuffer].mData, 0, ioData->mBuffers[iBuffer].mDataByteSize);
-        }
-        
-        if (!sm.playing)
-            return noErr;
-        if (!sm.outputBlock)
-            return noErr;
-        
-        
-        // Collect data to render from the callbacks
-        sm.outputBlock(sm.outData, inNumberFrames, sm.numOutputChannels);
-        
-        
-        // Put the rendered data into the output buffer
-        // TODO: convert SInt16 ranges to float ranges.
-        if ( sm.numBytesPerSample == 4 ) // then we've already got floats
-        {
-            
-            for (int iBuffer=0; iBuffer < ioData->mNumberBuffers; ++iBuffer) {
-                
-                int thisNumChannels = ioData->mBuffers[iBuffer].mNumberChannels;
-                
-                for (int iChannel = 0; iChannel < thisNumChannels; ++iChannel) {
-
-                    int interleaveOffset = iChannel;
-                    if (iBuffer < sm.numOutputChannels){
-                        interleaveOffset += iBuffer;
-                    }
-                    
-                    vDSP_vsadd(sm.outData+interleaveOffset, sm.numOutputChannels, &zero, (float *)ioData->mBuffers[iBuffer].mData, thisNumChannels, inNumberFrames);
-                    
-                }
-            }
-        }
-        else if ( sm.numBytesPerSample == 2 ) // then we need to convert SInt16 -> Float (and also scale)
-        {
-            float scale = (float)INT16_MAX;
-            vDSP_vsmul(sm.outData, 1, &scale, sm.outData, 1, inNumberFrames*sm.numOutputChannels);
-            
-            for (int iBuffer=0; iBuffer < ioData->mNumberBuffers; ++iBuffer) {
-                
-                int thisNumChannels = ioData->mBuffers[iBuffer].mNumberChannels;
-                
-                for (int iChannel = 0; iChannel < thisNumChannels; ++iChannel) {
-                    
-                    int interleaveOffset = iChannel;
-                    if (iBuffer < sm.numOutputChannels){
-                        interleaveOffset += iBuffer;
-                    }
-                    
-                    vDSP_vfix16(sm.outData+interleaveOffset, sm.numOutputChannels, (SInt16 *)ioData->mBuffers[iBuffer].mData+iChannel, thisNumChannels, inNumberFrames);
-                }
-            }
-            
-        }
-    }
-
-    return noErr;
-    
-}	
-
-#pragma mark - Audio Session Listeners
-#if defined (USING_IOS)
-void sessionPropertyListener(void *                  inClientData,
-							 AudioSessionPropertyID  inID,
-							 UInt32                  inDataSize,
-							 const void *            inData){
-	
-    // Determines the reason for the route change, to ensure that it is not
-    //      because of a category change.
-    CFNumberRef routeChangeReasonRef = (CFNumberRef)CFDictionaryGetValue ((CFDictionaryRef)inData, CFSTR (kAudioSession_AudioRouteChangeKey_Reason) );
-    SInt32 routeChangeReason;
-    CFNumberGetValue (routeChangeReasonRef, kCFNumberSInt32Type, &routeChangeReason);
-    
-    if (inID == kAudioSessionProperty_AudioRouteChange && routeChangeReason != kAudioSessionRouteChangeReason_CategoryChange)
-    {
-        Novocaine *sm = (__bridge Novocaine *)inClientData;
-        [sm checkSessionProperties];
-    }
-    
-}
-
-- (void)checkAudioSource {
-    // Check what the incoming audio route is.
-    UInt32 propertySize = sizeof(CFStringRef);
-    CFStringRef route;
-    CheckError( AudioSessionGetProperty(kAudioSessionProperty_AudioRoute, &propertySize, &route), "Couldn't check the audio route");
-    self.inputRoute = (__bridge NSString *)route;
-    CFRelease(route);
-    NSLog(@"AudioRoute: %@", self.inputRoute);
-    
-    
-    // Check if there's input available.
-    // TODO: check if checking for available input is redundant.
-    //          Possibly there's a different property ID change?
-    UInt32 isInputAvailable = 0;
-    UInt32 size = sizeof(isInputAvailable);
-    CheckError( AudioSessionGetProperty(kAudioSessionProperty_AudioInputAvailable, 
-                                        &size, 
-                                        &isInputAvailable), "Couldn't check if input is available");
-    self.inputAvailable = (BOOL)isInputAvailable;
-    NSLog(@"Input available? %d", self.inputAvailable);
-    
-}
-
-
-// To be run ONCE per session property change and once on initialization.
-- (void)checkSessionProperties
-{	
-    
-    // Check if there is input, and from where
-    [self checkAudioSource];
-    
-    // Check the number of input channels.
-    // Find the number of channels
-    UInt32 size = sizeof(self.numInputChannels);
-    UInt32 newNumChannels;
-    CheckError( AudioSessionGetProperty(kAudioSessionProperty_CurrentHardwareInputNumberChannels, &size, &newNumChannels), "Checking number of input channels");
-    self.numInputChannels = newNumChannels;
-    //    self.numInputChannels = 1;
-    NSLog(@"We've got %u input channels", (unsigned int)self.numInputChannels);
-    
-    
-    // Check the number of input channels.
-    // Find the number of channels
-    CheckError( AudioSessionGetProperty(kAudioSessionProperty_CurrentHardwareOutputNumberChannels, &size, &newNumChannels), "Checking number of output channels");
-    self.numOutputChannels = newNumChannels;
-    //    self.numOutputChannels = 1;
-    NSLog(@"We've got %u output channels", (unsigned int)self.numOutputChannels);
-    
-    
-    // Get the hardware sampling rate. This is settable, but here we're only reading.
-    Float64 currentSamplingRate;
-    size = sizeof(currentSamplingRate);
-    CheckError( AudioSessionGetProperty(kAudioSessionProperty_CurrentHardwareSampleRate, &size, &currentSamplingRate), "Checking hardware sampling rate");
-    self.samplingRate = currentSamplingRate;
-    NSLog(@"Current sampling rate: %f", self.samplingRate);
-	
-}
-
-void sessionInterruptionListener(void *inClientData, UInt32 inInterruption) {
-    
-	Novocaine *sm = (__bridge Novocaine *)inClientData;
-    
-	if (inInterruption == kAudioSessionBeginInterruption) {
-		NSLog(@"Begin interuption");
-		sm.inputAvailable = NO;
-	}
-	else if (inInterruption == kAudioSessionEndInterruption) {
-		NSLog(@"End interuption");	
-		sm.inputAvailable = YES;
-		[sm play];
-	}
-	
-}
-
-#endif
-
-
-
-
-#if defined ( USING_OSX )
-
-// Checks the number of channels and sampling rate of the connected device.
-- (void)checkDeviceProperties
-{
-    
-}
-
-- (void)selectAudioDevice:(AudioDeviceID)deviceID
-{
-    
-}
-
-#endif
-
-
-#pragma mark - Convenience Methods
-- (NSString *)applicationDocumentsDirectory {
-	return [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject];
-}
-
-
-@end
-
-
-
-
-
-
-
-
diff --git a/Novocaine iOS Example/Novocaine/RingBuffer.h b/Novocaine iOS Example/Novocaine/RingBuffer.h
deleted file mode 100644
index 150cdaa..0000000
--- a/Novocaine iOS Example/Novocaine/RingBuffer.h	
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-// TODO: Error throwing if things go wrong.
-#import <AudioToolbox/AudioToolbox.h>
-#import <Accelerate/Accelerate.h>
-
-#define kMaxNumChannels 4
-
-class RingBuffer {
-    
-public:	
-	RingBuffer() {};
-	RingBuffer(SInt64 bufferLength, SInt64 numChannels);
-	~RingBuffer();
-	
-	void AddNewSInt16AudioBuffer(const AudioBuffer aBuffer);
-	void AddNewSInt16Data(const SInt16 *newData, const SInt64 numFrames, const SInt64 whichChannel);
-	void AddNewFloatData(const float *newData, const SInt64 numFrames, const SInt64 whichChannel = 0);
-	void AddNewDoubleData(const double *newData, const SInt64 numFrames, const SInt64 whichChannel = 0);
-	void AddNewInterleavedFloatData(const float *newData, const SInt64 numFrames, const SInt64 numChannelsHere);
-    void FetchInterleavedData(float *outData, SInt64 numFrames, SInt64 numChannels);
-	void FetchFreshData(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride);
-	void FetchFreshData2(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride);
-    
-    void FetchData(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride);
-	SInt64 NumNewFrames(SInt64 lastReadFrame, int iChannel = 0);
-    SInt64 NumUnreadFrames(int iChannel = 0) {return mNumUnreadFrames[iChannel]; }
-	
-	SInt64 WriteHeadPosition(int aChannel = 0) { return mLastWrittenIndex[aChannel]; }
-	SInt64 ReadHeadPosition(int aChannel = 0) { return mLastReadIndex[aChannel]; }
-    
-    void SeekWriteHeadPosition(SInt64 offset, int iChannel=0);
-    void SeekReadHeadPosition(SInt64 offset, int iChannel=0);
-	SInt64 NumChannels() {return mNumChannels; }
-	
-	void Clear();
-	
-	// Analytics
-	float Mean(const SInt64 whichChannel = 0);
-	float Max(const SInt64 whichChannel = 0);
-	float Min(const SInt64 whichChannel = 0);
-	
-protected:
-	int64_t mLastWrittenIndex[kMaxNumChannels];
-	int64_t mLastReadIndex[kMaxNumChannels];
-    int64_t mNumUnreadFrames[kMaxNumChannels];
-	int64_t mSizeOfBuffer;
-	int64_t mNumChannels;
-	float **mData;
-	bool mAllocated;
-
-private:
-    void UpdateFrameCount(SInt64 numFrames, SInt64 channel);
-	
-};
\ No newline at end of file
diff --git a/Novocaine iOS Example/Novocaine/RingBuffer.mm b/Novocaine iOS Example/Novocaine/RingBuffer.mm
deleted file mode 100644
index f64d690..0000000
--- a/Novocaine iOS Example/Novocaine/RingBuffer.mm	
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-
-#include "RingBuffer.h"
-#import <libkern/OSAtomic.h>
-
-static void atomic_set(int64_t *ptr, int64_t value)
-{
-    OSAtomicAdd64(value - *ptr, ptr);
-}
-
-RingBuffer::RingBuffer(SInt64 bufferLength, SInt64 numChannels) : 
-mSizeOfBuffer(bufferLength)
-{
-	if (numChannels > kMaxNumChannels)
-		mNumChannels = kMaxNumChannels;
-	else if (numChannels <= 0)
-		mNumChannels = 1;
-	else
-		mNumChannels = numChannels;
-	
-	mData = (float **)calloc(numChannels, sizeof(float *));
-	for (int i=0; i < numChannels; ++i) {
-		mData[i] = (float *)calloc(bufferLength, sizeof(float));
-		mLastWrittenIndex[i] = 0;
-		mLastReadIndex[i] = 0;
-        mNumUnreadFrames[i] = 0;
-	}
-		
-}
-
-RingBuffer::~RingBuffer() 
-{
-    for (int i=0; i<mNumChannels; i++) {
-        free(mData[i]);
-    }
-}
-
-void RingBuffer::UpdateFrameCount(SInt64 numFrames, SInt64 channel)
-{
-    atomic_set(&mLastWrittenIndex[channel], (mLastWrittenIndex[channel] + numFrames) % (mSizeOfBuffer));
-    int64_t unreadFrames = mNumUnreadFrames[channel] + numFrames;
-    if (unreadFrames >= mSizeOfBuffer) unreadFrames = mSizeOfBuffer;
-    
-    atomic_set(&mNumUnreadFrames[channel], unreadFrames);
-}
-
-void RingBuffer::AddNewSInt16AudioBuffer(const AudioBuffer aBuffer)
-{
-		
-	int numChannelsHere = aBuffer.mNumberChannels;
-	int numFrames = aBuffer.mDataByteSize/(numChannelsHere*sizeof(SInt16));
-	SInt16 *newData = (SInt16 *)aBuffer.mData;
-	
-	SInt64 idx;
-		
-	for (int iChannel = 0; iChannel < mNumChannels; ++iChannel) {
-		for (int i=0; i < numFrames; ++i) {
-			idx = (i + mLastWrittenIndex[iChannel]) % (mSizeOfBuffer);
-			mData[iChannel][idx] = (float)newData[i*numChannelsHere + iChannel];
-		}
-        
-        UpdateFrameCount(numFrames, iChannel);
-	}
-	
-	
-}
-
-void RingBuffer::AddNewSInt16Data(const SInt16 *newData, const SInt64 numFrames, const SInt64 whichChannel)
-{
-	SInt64 idx;
-	for (int i=0; i < numFrames; ++i) {
-		idx = (i + mLastWrittenIndex[whichChannel]) % (mSizeOfBuffer);
-		mData[whichChannel][idx] = (float)newData[i];
-	}
-    
-    UpdateFrameCount(numFrames, whichChannel);
-}
-
-void RingBuffer::AddNewFloatData(const float *newData, const SInt64 numFrames, const SInt64 whichChannel)
-{
-	
-	SInt64 idx;
-	for (int i=0; i < numFrames; ++i) {
-		idx = (i + mLastWrittenIndex[whichChannel]) % (mSizeOfBuffer);
-		mData[whichChannel][idx] = newData[i];
-	}
-    
-    UpdateFrameCount(numFrames, whichChannel);
-}
-
-void RingBuffer::AddNewDoubleData(const double *newData, const SInt64 numFrames, const SInt64 whichChannel)
-{
-	
-	SInt64 idx;
-	for (int i=0; i < numFrames; ++i) {
-		idx = (i + mLastWrittenIndex[whichChannel]) % (mSizeOfBuffer);
-		mData[whichChannel][idx] = (float)newData[i];
-	}
-    UpdateFrameCount(numFrames, whichChannel);
-}
-
-void RingBuffer::AddNewInterleavedFloatData(const float *newData, const SInt64 numFrames, const SInt64 numChannelsHere)
-{
-	
-	SInt64 numChannelsToCopy = (numChannelsHere <= mNumChannels) ? numChannelsHere : mNumChannels;
-	float zero = 0.0f;
-	
-	for (int iChannel = 0; iChannel < numChannelsToCopy; ++iChannel) {
-		
-		if (numFrames + mLastWrittenIndex[iChannel] < mSizeOfBuffer) { // if our new set of samples won't overrun the edge of the buffer
-			vDSP_vsadd((float *)&newData[iChannel], 
-					   numChannelsHere, 
-					   &zero, 
-					   &mData[iChannel][mLastWrittenIndex[iChannel]],
-					   1, 
-					   numFrames);
-		} else {														// if we will overrun, then we need to do two separate copies.
-			SInt64 numSamplesInFirstCopy = mSizeOfBuffer - mLastWrittenIndex[iChannel];
-			SInt64 numSamplesInSecondCopy = numFrames - numSamplesInFirstCopy;
-            
-			vDSP_vsadd((float *)&newData[iChannel], 
-					   numChannelsHere, 
-					   &zero, 
-					   &mData[iChannel][mLastWrittenIndex[iChannel]],
-					   1, 
-					   numSamplesInFirstCopy);
-            
-			vDSP_vsadd((float *)&newData[numSamplesInFirstCopy*numChannelsHere + iChannel], 
-					   numChannelsHere, 
-					   &zero, 
-					   &mData[iChannel][0],
-					   1, 
-					   numSamplesInSecondCopy);
-		}
-        
-        UpdateFrameCount(numFrames, iChannel);
-	}
-	
-	
-}
-
-void RingBuffer::FetchFreshData2(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride)
-{
-
-    if (mLastWrittenIndex[whichChannel] - numFrames >= 0) { // if we're requesting samples that won't go off the left end of the ring buffer, then go ahead and copy them all out.
-        
-        UInt64 idx = mLastWrittenIndex[whichChannel] - numFrames;
-        float zero = 0.0f;
-        vDSP_vsadd(&mData[whichChannel][idx], 
-                   1, 
-                   &zero, 
-                   outData, 
-                   stride, 
-                   numFrames);
-    }
-    
-    else { // if we will overrun, then we need to do two separate copies.
-        
-        // The copy that bleeds off the left, and cycles back to the right of the ring buffer
-        int64_t numSamplesInFirstCopy = numFrames - mLastWrittenIndex[whichChannel];
-        // The copy that starts at the beginning, and proceeds to the end.
-        int64_t numSamplesInSecondCopy = mLastWrittenIndex[whichChannel];
-        
-        
-        float zero = 0.0f;
-        UInt64 firstIndex = mSizeOfBuffer - numSamplesInFirstCopy;
-        vDSP_vsadd(&mData[whichChannel][firstIndex],
-                   1, 
-                   &zero, 
-                   &outData[0], 
-                   stride, 
-                   numSamplesInFirstCopy);
-
-        vDSP_vsadd(&mData[whichChannel][0],
-                   1, 
-                   &zero, 
-                   &outData[numSamplesInFirstCopy*stride],
-                   stride, 
-                   numSamplesInSecondCopy);
-        
-    }
-
-}
-
-void RingBuffer::FetchData(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride)
-{
-    int64_t idx;
-	for (int i=0; i < numFrames; ++i) {
-		idx = (mLastReadIndex[whichChannel] + i) % (mSizeOfBuffer);
-		outData[i*stride] = mData[whichChannel][idx];
-	}
-	
-    atomic_set(&mLastReadIndex[whichChannel], (mLastReadIndex[whichChannel] + numFrames) % (mSizeOfBuffer));
-    
-    int64_t toAdd;
-    
-    if(mNumUnreadFrames[whichChannel] > numFrames)
-        toAdd = -numFrames;
-    else
-        toAdd = -mNumUnreadFrames[whichChannel];
-    
-    OSAtomicAdd64(toAdd, &mNumUnreadFrames[whichChannel]);
-
-}
-
-void RingBuffer::FetchInterleavedData(float *outData, SInt64 numFrames, SInt64 numChannels)
-{
-    for (int iChannel=0; iChannel < numChannels; ++iChannel) {
-        FetchData(&outData[iChannel], numFrames, iChannel, numChannels);
-    }
-
-}
-
-void RingBuffer::FetchFreshData(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride)
-{
-
-	int64_t idx;
-	for (int i=0; i < numFrames; ++i) {
-		idx = (mLastWrittenIndex[whichChannel] - numFrames + i) % (mSizeOfBuffer);
-		outData[i*stride] = mData[whichChannel][idx];
-	}
-	
-	atomic_set(&mLastReadIndex[whichChannel], mLastWrittenIndex[whichChannel]);
-    // Reading at the front of the buffer resets old data
-    atomic_set(&mNumUnreadFrames[whichChannel], 0);
-}
-
-void RingBuffer::SeekWriteHeadPosition(SInt64 offset, int iChannel)
-{
-    atomic_set(&mLastWrittenIndex[iChannel], (mLastWrittenIndex[iChannel] + offset) % (mSizeOfBuffer));
-}
-
-void RingBuffer::SeekReadHeadPosition(SInt64 offset, int iChannel)
-{
-     atomic_set(&mLastReadIndex[iChannel], (mLastReadIndex[iChannel] + offset) % (mSizeOfBuffer));
-}
-
-
-SInt64 RingBuffer::NumNewFrames(SInt64 lastReadFrame, int iChannel)
-{
-	int64_t numNewFrames = mLastWrittenIndex[iChannel] - lastReadFrame;
-	if (numNewFrames < 0) numNewFrames += mSizeOfBuffer;
-	
-	return (SInt64)numNewFrames;
-}
-
-#pragma mark - Analytics
-float RingBuffer::Mean(const SInt64 whichChannel)
-{
-	float mean;
-	vDSP_meanv(mData[whichChannel],1,&mean,mSizeOfBuffer);
-	return mean;
-}
-
-
-float RingBuffer::Max(const SInt64 whichChannel)
-{
-	float max;
-	vDSP_maxv(mData[whichChannel],1,&max,mSizeOfBuffer);
-	return max;
-}
-
-
-float RingBuffer::Min(const SInt64 whichChannel)
-{
-	float min;
-	vDSP_minv(mData[whichChannel],1,&min,mSizeOfBuffer);
-	return min;	
-}
-
-
-void RingBuffer::Clear()
-{
-	for (int i=0; i < mNumChannels; ++i) {
-        atomic_set(&mLastWrittenIndex[i], 0);
-        atomic_set(&mLastReadIndex[i], 0);
-        atomic_set(&mNumUnreadFrames[i], 0);
-		memset(mData[i], 0, sizeof(float)*mSizeOfBuffer);
-	}
-	
-}
-
diff --git a/Novocaine iOS Example/NovocaineViewController.h b/Novocaine iOS Example/NovocaineViewController.h
deleted file mode 100644
index de20f73..0000000
--- a/Novocaine iOS Example/NovocaineViewController.h	
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-
-#import <UIKit/UIKit.h>
-#import "Novocaine.h"
-#import "RingBuffer.h"
-#import "AudioFileReader.h"
-#import "AudioFileWriter.h"
-
-@interface ViewController : UIViewController
-
-@property (nonatomic, strong) Novocaine *audioManager;
-@property (nonatomic, strong) AudioFileReader *fileReader;
-@property (nonatomic, strong) AudioFileWriter *fileWriter;
-
-@end
diff --git a/Novocaine iOS Example/NovocaineViewController.mm b/Novocaine iOS Example/NovocaineViewController.mm
deleted file mode 100644
index 8a458bb..0000000
--- a/Novocaine iOS Example/NovocaineViewController.mm	
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-
-#import "ViewController.h"
-
-@interface ViewController ()
-
-@property (nonatomic, assign) RingBuffer *ringBuffer;
-
-@end
-
-@implementation ViewController
-
-- (void)dealloc
-{
-    delete self.ringBuffer;
-}
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-	// Do any additional setup after loading the view, typically from a nib.
-}
-
-- (void)viewDidUnload
-{
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-}
-
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    
-    __weak ViewController * wself = self;
-
-    self.ringBuffer = new RingBuffer(32768, 2);
-    self.audioManager = [Novocaine audioManager];
-
-    
-    // Basic playthru example
-//    [self.audioManager setInputBlock:^(float *data, UInt32 numFrames, UInt32 numChannels) {
-//        float volume = 0.5;
-//        vDSP_vsmul(data, 1, &volume, data, 1, numFrames*numChannels);
-//        wself.ringBuffer->AddNewInterleavedFloatData(data, numFrames, numChannels);
-//    }];
-    
-    
-//    [self.audioManager setOutputBlock:^(float *outData, UInt32 numFrames, UInt32 numChannels) {
-//        wself.ringBuffer->FetchInterleavedData(outData, numFrames, numChannels);
-//    }];
-
-    // VOICE-MODULATED OSCILLATOR
-    
-//    __block float magnitude = 0.0;
-//    [self.audioManager setInputBlock:^(float *data, UInt32 numFrames, UInt32 numChannels)
-//     {
-//         vDSP_rmsqv(data,1, &magnitude, numFrames*numChannels);
-//     }];
-    
-//    __block float frequency = 100.0;
-//    __block float phase = 0.0;
-//    [self.audioManager setOutputBlock:^(float *data, UInt32 numFrames, UInt32 numChannels)
-//     {
-//         printf("Magnitude: %f\n", magnitude);
-//         float samplingRate = wself.audioManager.samplingRate;
-//         for (int i=0; i < numFrames; ++i)
-//         {
-//             for (int iChannel = 0; iChannel < numChannels; ++iChannel)
-//             {
-//                 float theta = phase * M_PI * 2;
-//                 data[i*numChannels + iChannel] = magnitude*sin(theta);
-//             }
-//             phase += 1.0 / (samplingRate / (frequency));
-//             if (phase > 1.0) phase = -1;
-//         }
-//     }];
-    
-    
-     // MAKE SOME NOOOOO OIIIISSSEEE
-    // ==================================================
-//     [self.audioManager setOutputBlock:^(float *newdata, UInt32 numFrames, UInt32 thisNumChannels)
-//         {
-//             for (int i = 0; i < numFrames * thisNumChannels; i++) {
-//                 newdata[i] = (rand() % 100) / 100.0f / 2;
-//         }
-//     }];
-    
-    
-    // MEASURE SOME DECIBELS!
-    // ==================================================
-//    __block float dbVal = 0.0;
-//    [self.audioManager setInputBlock:^(float *data, UInt32 numFrames, UInt32 numChannels) {
-//
-//        vDSP_vsq(data, 1, data, 1, numFrames*numChannels);
-//        float meanVal = 0.0;
-//        vDSP_meanv(data, 1, &meanVal, numFrames*numChannels);
-//
-//        float one = 1.0;
-//        vDSP_vdbcon(&meanVal, 1, &one, &meanVal, 1, 1, 0);
-//        dbVal = dbVal + 0.2*(meanVal - dbVal);
-//        printf("Decibel level: %f\n", dbVal);
-//        
-//    }];
-    
-    // SIGNAL GENERATOR!
-//    __block float frequency = 2000.0;
-//    __block float phase = 0.0;
-//    [self.audioManager setOutputBlock:^(float *data, UInt32 numFrames, UInt32 numChannels)
-//     {
-//
-//         float samplingRate = wself.audioManager.samplingRate;
-//         for (int i=0; i < numFrames; ++i)
-//         {
-//             for (int iChannel = 0; iChannel < numChannels; ++iChannel) 
-//             {
-//                 float theta = phase * M_PI * 2;
-//                 data[i*numChannels + iChannel] = sin(theta);
-//             }
-//             phase += 1.0 / (samplingRate / frequency);
-//             if (phase > 1.0) phase = -1;
-//         }
-//     }];
-    
-    
-    // DALEK VOICE!
-    // (aka Ring Modulator)
-    
-    [self.audioManager setInputBlock:^(float *data, UInt32 numFrames, UInt32 numChannels)
-     {
-         wself.ringBuffer->AddNewInterleavedFloatData(data, numFrames, numChannels);
-     }];
-    
-    __block float frequency = 100.0;
-    __block float phase = 0.0;
-    [self.audioManager setOutputBlock:^(float *data, UInt32 numFrames, UInt32 numChannels)
-     {
-         wself.ringBuffer->FetchInterleavedData(data, numFrames, numChannels);
-         
-         // printf("phase: %f\n", phase);
-         
-         float samplingRate = wself.audioManager.samplingRate;
-         for (int i=0; i < numFrames; ++i)
-         {
-             for (int iChannel = 0; iChannel < numChannels; ++iChannel)
-             {
-                 float theta = phase * M_PI * 2;
-                 //float sin_theta = sin(theta);
-                 //printf("data[%i]: %f\n", data_entry, data[data_entry]);
-                 //printf("phase: %f\n", phase);
-                 data[i*numChannels + iChannel] *= sin(theta);
-             }
-             phase += 1.0 / (samplingRate / frequency);
-             if (phase > 1.0) phase = -1;
-         }
-     }];
-
-    
-    // AUDIO FILE READING OHHH YEAHHHH
-    // ========================================    
-//    NSURL *inputFileURL = [[NSBundle mainBundle] URLForResource:@"TLC" withExtension:@"mp3"];
-
-//        self.fileReader = [[AudioFileReader alloc]
-//                           initWithAudioFileURL:inputFileURL
-//                           samplingRate:self.audioManager.samplingRate
-//                           numChannels:self.audioManager.numOutputChannels];
-    
-//    [self.fileReader play];
-//    self.fileReader.currentTime = 30.0;
-    
-    
-//    [self.audioManager setOutputBlock:^(float *data, UInt32 numFrames, UInt32 numChannels)
-//     {
-//         [wself.fileReader retrieveFreshAudio:data numFrames:numFrames numChannels:numChannels];
-//         NSLog(@"Time: %f", wself.fileReader.currentTime);
-//     }];
-    
-    // AUDIO FILE WRITING YEAH!
-    // ========================================    
-//    NSArray *pathComponents = [NSArray arrayWithObjects:
-//                               [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject], 
-//                               @"My Recording.m4a", 
-//                               nil];
-//    NSURL *outputFileURL = [NSURL fileURLWithPathComponents:pathComponents];
-//    NSLog(@"URL: %@", outputFileURL);
-//    
-//    self.fileWriter = [[AudioFileWriter alloc]
-//                       initWithAudioFileURL:outputFileURL 
-//                       samplingRate:self.audioManager.samplingRate
-//                       numChannels:self.audioManager.numInputChannels];
-//    
-//    
-//    __block int counter = 0;
-//    self.audioManager.inputBlock = ^(float *data, UInt32 numFrames, UInt32 numChannels) {
-//        [wself.fileWriter writeNewAudio:data numFrames:numFrames numChannels:numChannels];
-//        counter += 1;
-//        if (counter > 400) { // roughly 5 seconds of audio
-//            wself.audioManager.inputBlock = nil;
-//        }
-//    };
-
-    // START IT UP YO
-    [self.audioManager play];
-
-}
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) {
-        return (interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown);
-    } else {
-        return YES;
-    }
-}
-
-@end
diff --git a/Novocaine iOS Example/en.lproj/InfoPlist.strings b/Novocaine iOS Example/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28f..0000000
--- a/Novocaine iOS Example/en.lproj/InfoPlist.strings	
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/Novocaine iOS Example/en.lproj/ViewController_iPad.xib b/Novocaine iOS Example/en.lproj/ViewController_iPad.xib
deleted file mode 100644
index cd02abe..0000000
--- a/Novocaine iOS Example/en.lproj/ViewController_iPad.xib	
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">11C25</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1919</string>
-		<string key="IBDocument.AppKitVersion">1138.11</string>
-		<string key="IBDocument.HIToolboxVersion">566.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">916</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="841351856">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-			</object>
-			<object class="IBProxyObject" id="606714003">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-			</object>
-			<object class="IBUIView" id="766721923">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<string key="NSFrame">{{0, 20}, {768, 1004}}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<object class="NSColorSpace" key="NSCustomColorSpace">
-						<int key="NSID">2</int>
-					</object>
-				</object>
-				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
-					<int key="IBUIStatusBarStyle">2</int>
-				</object>
-				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="766721923"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="841351856"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="606714003"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="766721923"/>
-						<reference key="parent" ref="0"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">ViewController</string>
-				<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="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">3</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">916</string>
-	</data>
-</archive>
diff --git a/Novocaine iOS Example/en.lproj/ViewController_iPhone.xib b/Novocaine iOS Example/en.lproj/ViewController_iPhone.xib
deleted file mode 100644
index e7178e4..0000000
--- a/Novocaine iOS Example/en.lproj/ViewController_iPhone.xib	
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">11C25</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1919</string>
-		<string key="IBDocument.AppKitVersion">1138.11</string>
-		<string key="IBDocument.HIToolboxVersion">566.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">916</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBProxyObject" id="843779117">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIView" id="774585933">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MC43NQA</bytes>
-					<object class="NSColorSpace" key="NSCustomColorSpace">
-						<int key="NSID">2</int>
-					</object>
-				</object>
-				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="774585933"/>
-					</object>
-					<int key="connectionID">7</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="843779117"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">6</int>
-						<reference key="object" ref="774585933"/>
-						<reference key="parent" ref="0"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">ViewController</string>
-				<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="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">7</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">ViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/ViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">916</string>
-	</data>
-</archive>
diff --git a/Novocaine iOS Example/main.m b/Novocaine iOS Example/main.m
deleted file mode 100644
index 5e34318..0000000
--- a/Novocaine iOS Example/main.m	
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-//  main.m
-//  Novocaine
-//
-//  Created by Alex Wiltschko on 4/2/12.
-//  Copyright (c) 2012 Datta Lab, Harvard University. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-#import "AppDelegate.h"
-
-int main(int argc, char *argv[])
-{
-    @autoreleasepool {
-        return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class]));
-    }
-}
diff --git a/Novocaine/AudioFileReader.h b/Novocaine/AudioFileReader.h
deleted file mode 100644
index 613b4d9..0000000
--- a/Novocaine/AudioFileReader.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-#import <Foundation/Foundation.h>
-#import "RingBuffer.h"
-#import "Novocaine.h"
-
-// ARC only supports GCD objects if the minimum deployment target is iOS 6+ or OS X 10.8+
-#if TARGET_OS_IPHONE
-  // Compiling for iOS
-    #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000   // iOS 6.0 or later
-        #define NEEDS_DISPATCH_RETAIN_RELEASE 0
-    #else                                           // iOS 5.x or earlier
-        #define NEEDS_DISPATCH_RETAIN_RELEASE 1
-    #endif
-#else
-    // Compiling for Mac OS X
-    #if MAC_OS_X_VERSION_MIN_REQUIRED >= 1080       // Mac OS X 10.8 or later
-        #define NEEDS_DISPATCH_RETAIN_RELEASE 0
-    #else
-        #define NEEDS_DISPATCH_RETAIN_RELEASE 1     // Mac OS X 10.7 or earlier
-    #endif
-#endif
-
-@interface AudioFileReader : NSObject
-
-// ----- Read-write ------
-
-@property (nonatomic, assign, getter=getCurrentTime, setter=setCurrentTime:) float currentTime;
-@property (nonatomic, copy) NovocaineInputBlock readerBlock;
-@property (nonatomic, assign) float latency;
-
-// ----- Read-only ------
-
-@property (nonatomic, copy, readonly)   NSURL *audioFileURL;
-@property (nonatomic, assign, readonly, getter=getDuration) float duration;
-@property (nonatomic, assign, readonly) float samplingRate;
-@property (nonatomic, assign, readonly) UInt32 numChannels;
-@property (nonatomic, assign, readonly) BOOL playing;
-
-
-- (id)initWithAudioFileURL:(NSURL *)urlToAudioFile samplingRate:(float)thisSamplingRate numChannels:(UInt32)thisNumChannels;
-
-// You use this method to grab audio if you have your own callback.
-// The buffer'll fill at the speed the audio is normally being played.
-
-- (void)retrieveFreshAudio:(float *)buffer numFrames:(UInt32)thisNumFrames numChannels:(UInt32)thisNumChannels;
-
-- (void)play;
-- (void)pause;
-- (void)stop;
-
-
-@end
diff --git a/Novocaine/AudioFileReader.mm b/Novocaine/AudioFileReader.mm
deleted file mode 100644
index 9a26446..0000000
--- a/Novocaine/AudioFileReader.mm
+++ /dev/null
@@ -1,286 +0,0 @@
-//
-//  AudioFileReader.m
-//  Novocaine
-//
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-#import "AudioFileReader.h"
-
-@interface AudioFileReader ()
-{
-    RingBuffer *ringBuffer;
-}
-
-// redeclaration as readwrite in class continuation
-@property (nonatomic, copy, readwrite)   NSURL *audioFileURL;
-@property (nonatomic, assign, readwrite, getter=getDuration) float duration;
-@property (nonatomic, assign, readwrite) float samplingRate;
-@property (nonatomic, assign, readwrite) UInt32 numChannels;
-@property (nonatomic, assign, readwrite) BOOL playing;
-
-@property (nonatomic, assign) AudioStreamBasicDescription outputFormat;
-@property (nonatomic, assign) ExtAudioFileRef inputFile;
-@property (nonatomic, assign) UInt32 outputBufferSize;
-@property (nonatomic, assign) float *outputBuffer;
-@property (nonatomic, assign) float *holdingBuffer;
-@property (nonatomic, assign) UInt32 numSamplesReadPerPacket;
-@property (nonatomic, assign) UInt32 desiredPrebufferedSamples;
-@property (nonatomic, assign) SInt64 currentFileTime;
-@property (nonatomic, assign) dispatch_source_t callbackTimer;
-
-- (void)bufferNewAudio;
-
-@end
-
-
-@implementation AudioFileReader
-
-
-- (void)dealloc
-{
-    // If the dispatch timer is active, close it off
-    if (self.playing)
-        [self pause];
-    
-    self.readerBlock = nil;
-    
-    // Close the ExtAudioFile
-    ExtAudioFileDispose(self.inputFile);
-    
-    free(self.outputBuffer);
-    free(self.holdingBuffer);
-    
-    delete ringBuffer;
-    
-}
-
-
-- (id)initWithAudioFileURL:(NSURL *)urlToAudioFile samplingRate:(float)thisSamplingRate numChannels:(UInt32)thisNumChannels
-{
-    self = [super init];
-    if (self)
-    {
-        
-        // Zero-out our timer, so we know we're not using our callback yet
-        self.callbackTimer = nil;
-        
-        // Open a reference to the audio file
-        self.audioFileURL = urlToAudioFile;
-        CFURLRef audioFileRef = (__bridge CFURLRef)self.audioFileURL;
-        CheckError(ExtAudioFileOpenURL(audioFileRef, &_inputFile), "Opening file URL (ExtAudioFileOpenURL)");
-
-        
-        // Set a few defaults and presets
-        self.samplingRate = thisSamplingRate;
-        self.numChannels = thisNumChannels;
-        self.latency = .011609977; // 512 samples / ( 44100 samples / sec ) default
-        
-        
-        // We're going to impose a format upon the input file
-        // Single-channel float does the trick.
-        _outputFormat.mSampleRate = self.samplingRate;
-        _outputFormat.mFormatID = kAudioFormatLinearPCM;
-        _outputFormat.mFormatFlags = kAudioFormatFlagIsFloat;
-        _outputFormat.mBytesPerPacket = 4*self.numChannels;
-        _outputFormat.mFramesPerPacket = 1;
-        _outputFormat.mBytesPerFrame = 4*self.numChannels;
-        _outputFormat.mChannelsPerFrame = self.numChannels;
-        _outputFormat.mBitsPerChannel = 32;
-        
-        // Apply the format to our file
-        ExtAudioFileSetProperty(_inputFile, kExtAudioFileProperty_ClientDataFormat, sizeof(AudioStreamBasicDescription), &_outputFormat);
-        
-        
-        // Arbitrary buffer sizes that don't matter so much as long as they're "big enough"
-        self.outputBufferSize = 65536;
-        self.numSamplesReadPerPacket = 8192;
-        self.desiredPrebufferedSamples = self.numSamplesReadPerPacket*2;
-        self.outputBuffer = (float *)calloc(2*self.samplingRate, sizeof(float));
-        self.holdingBuffer = (float *)calloc(2*self.samplingRate, sizeof(float));
-        
-        
-        // Allocate a ring buffer (this is what's going to buffer our audio)
-        ringBuffer = new RingBuffer(self.outputBufferSize, self.numChannels);
-        
-        
-        // Fill up the buffers, so we're ready to play immediately
-        [self bufferNewAudio];
-        
-    }
-    return self;
-}
-
-- (void)clearBuffer
-{
-    ringBuffer->Clear();
-}
-
-- (void)bufferNewAudio
-{
-    
-    if (ringBuffer->NumUnreadFrames() > self.desiredPrebufferedSamples)
-        return;
-    
-    memset(self.outputBuffer, 0, sizeof(float)*self.desiredPrebufferedSamples);
-    
-    AudioBufferList incomingAudio;
-    incomingAudio.mNumberBuffers = 1;
-    incomingAudio.mBuffers[0].mNumberChannels = self.numChannels;
-    incomingAudio.mBuffers[0].mDataByteSize = self.outputBufferSize;
-    incomingAudio.mBuffers[0].mData = self.outputBuffer;
-    
-    // Figure out where we are in the file
-    SInt64 frameOffset = 0;
-    ExtAudioFileTell(self.inputFile, &frameOffset);
-    self.currentFileTime = (float)frameOffset / self.samplingRate;
-
-    // Read the audio
-    UInt32 framesRead = self.numSamplesReadPerPacket;
-    ExtAudioFileRead(self.inputFile, &framesRead, &incomingAudio);
-    
-    // Update where we are in the file
-    ExtAudioFileTell(self.inputFile, &frameOffset);
-    self.currentFileTime = (float)frameOffset / self.samplingRate;
-    
-    // Seems to fix issue #85 corrupted sample reads
-    // ExtAudioFileRead(self.inputFile, &framesRead, &incomingAudio);
-    
-    if ( framesRead == 0 ) { // EOF.
-        [self pause];
-    }
-    
-    // Add the new audio to the ring buffer
-    ringBuffer->AddNewInterleavedFloatData(self.outputBuffer, framesRead, self.numChannels);
-    
-    if ((self.currentFileTime - self.duration) < 0.01 && framesRead == 0) {
-        // modified to allow for auto-stopping. //
-        // Need to change your output block to check for [fileReader playing] and nuke your fileReader if it is   //
-        // not playing and not paused, on the next frame. Otherwise, the sound clip's final buffer is not played. //
-//        self.currentTime = 0.0f;
-        [self stop];
-        ringBuffer->Clear();
-    }
-    
-    
-}
-
-- (float)getCurrentTime
-{
-    return self.currentFileTime - ringBuffer->NumUnreadFrames()/self.samplingRate;
-}
-
-
-- (void)setCurrentTime:(float)thisCurrentTime
-{
-    dispatch_async(dispatch_get_main_queue(), ^{
-        [self clearBuffer];
-        ExtAudioFileSeek(self.inputFile, thisCurrentTime*self.samplingRate);
-    });
-}
-
-- (float)getDuration
-{
-    // We're going to directly calculate the duration of the audio file (in seconds)
-    SInt64 framesInThisFile;
-    UInt32 propertySize = sizeof(framesInThisFile);
-    ExtAudioFileGetProperty(self.inputFile, kExtAudioFileProperty_FileLengthFrames, &propertySize, &framesInThisFile);
-    
-    AudioStreamBasicDescription fileStreamFormat;
-    propertySize = sizeof(AudioStreamBasicDescription);
-    ExtAudioFileGetProperty(self.inputFile, kExtAudioFileProperty_FileDataFormat, &propertySize, &fileStreamFormat);
-    
-    return (float)framesInThisFile/(float)fileStreamFormat.mSampleRate;
-    
-}
-
-- (void)configureReaderCallback
-{
-    if (!self.callbackTimer)
-    {
-        self.callbackTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
-        UInt32 numSamplesPerCallback = (UInt32)( self.latency * self.samplingRate );
-        dispatch_source_set_timer(self.callbackTimer, dispatch_walltime(NULL, 0), self.latency*NSEC_PER_SEC, 0);
-        dispatch_source_set_event_handler(self.callbackTimer, ^{
-            
-            if (self.playing) {
-            
-                if (self.readerBlock) {
-                    // Suck some audio down from our ring buffer
-                    [self retrieveFreshAudio:self.holdingBuffer numFrames:numSamplesPerCallback numChannels:self.numChannels];
-                
-                    // Call out with the audio that we've got.
-                    self.readerBlock(self.holdingBuffer, numSamplesPerCallback, self.numChannels);
-                }
-                
-                // Asynchronously fill up the buffer (if it needs filling)
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    [self bufferNewAudio];
-                });
-                
-            }
-            
-         });
-        
-        dispatch_resume(self.callbackTimer);
-    }
-}
-
-
-- (void)retrieveFreshAudio:(float *)buffer numFrames:(UInt32)thisNumFrames numChannels:(UInt32)thisNumChannels
-{
-    ringBuffer->FetchInterleavedData(buffer, thisNumFrames, thisNumChannels);
-}
-
-
-- (void)play
-{
-
-    // Configure (or if necessary, create and start) the timer for retrieving audio
-    if (!self.playing) {
-        [self configureReaderCallback];
-        self.playing = TRUE;
-    }
-
-}
-
-- (void)pause
-{
-    // Pause the dispatch timer for retrieving the MP3 audio
-    self.playing = FALSE;
-}
-
-- (void)stop
-{
-    // Release the dispatch timer because it holds a reference to this class instance
-    [self pause];
-    if (self.callbackTimer) {
-#if NEEDS_DISPATCH_RETAIN_RELEASE
-        dispatch_release(self.callbackTimer);
-#endif
-        self.callbackTimer = nil;
-    }
-}
-
-
-@end
diff --git a/Novocaine/AudioFileWriter.h b/Novocaine/AudioFileWriter.h
deleted file mode 100644
index bdacd49..0000000
--- a/Novocaine/AudioFileWriter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-//  AudioFileWriter.h
-//  Novocaine
-//
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-#import <Foundation/Foundation.h>
-#import "Novocaine.h"
-
-
-@interface AudioFileWriter : NSObject
-
-// ----- Read-write ------
-@property (nonatomic, copy) NovocaineInputBlock writerBlock;
-
-// ----- Read-only ------
-@property (nonatomic, assign, getter=getDuration, readonly) float currentTime;
-@property (nonatomic, assign, getter=getDuration, readonly) float duration;
-@property (nonatomic, assign, readonly) float samplingRate;
-@property (nonatomic, assign, readonly) UInt32 numChannels;
-@property (nonatomic, assign, readonly) float latency;
-@property (nonatomic, copy, readonly)   NSURL *audioFileURL;
-@property (nonatomic, assign, readonly) BOOL recording;
-
-
-- (id)initWithAudioFileURL:(NSURL *)urlToAudioFile samplingRate:(float)thisSamplingRate numChannels:(UInt32)thisNumChannels;
-
-// You use this method to grab audio if you have your own callback.
-// The buffer'll fill at the speed the audio is normally being played.
-- (void)writeNewAudio:(float *)newData numFrames:(UInt32)thisNumFrames numChannels:(UInt32)thisNumChannels;
-
-- (void)record;
-- (void)pause;
-
-
-@end
diff --git a/Novocaine/AudioFileWriter.m b/Novocaine/AudioFileWriter.m
deleted file mode 100644
index c2c0236..0000000
--- a/Novocaine/AudioFileWriter.m
+++ /dev/null
@@ -1,232 +0,0 @@
-//
-//  AudioFileWriter.m
-//  Novocaine
-//
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-#import "AudioFileWriter.h"
-#import <pthread.h>
-
-@interface AudioFileWriter()
-
-// redeclare as readwrite in class continuation
-@property (nonatomic, assign, getter=getDuration, readwrite) float currentTime;
-@property (nonatomic, assign, getter=getDuration, readwrite) float duration;
-@property (nonatomic, assign, readwrite) float samplingRate;
-@property (nonatomic, assign, readwrite) UInt32 numChannels;
-@property (nonatomic, assign, readwrite) float latency;
-@property (nonatomic, copy, readwrite)   NSURL *audioFileURL;
-@property (nonatomic, assign, readwrite) BOOL recording;
-
-@property (nonatomic, assign) AudioStreamBasicDescription outputFormat;
-@property (nonatomic, assign) ExtAudioFileRef outputFile;
-@property (nonatomic, assign) UInt32 outputBufferSize;
-@property (nonatomic, assign) float *outputBuffer;
-@property (nonatomic, assign) float *holdingBuffer;
-@property (nonatomic, assign) SInt64 currentFileTime;
-@property (nonatomic, assign) dispatch_source_t callbackTimer;
-
-@end
-
-
-@implementation AudioFileWriter
-
-static pthread_mutex_t outputAudioFileLock;
-
-- (void)dealloc
-{
-    [self stop];
-    
-    free(self.outputBuffer);
-    free(self.holdingBuffer);
-    
-}
-
-- (id)initWithAudioFileURL:(NSURL *)urlToAudioFile samplingRate:(float)thisSamplingRate numChannels:(UInt32)thisNumChannels
-{
-    self = [super init];
-    if (self)
-    {
-        
-        // Zero-out our timer, so we know we're not using our callback yet
-        self.callbackTimer = nil;
-        
-        
-        // Open a reference to the audio file
-        self.audioFileURL = urlToAudioFile;
-        CFURLRef audioFileRef = (__bridge CFURLRef)self.audioFileURL;
-        
-        AudioStreamBasicDescription outputFileDesc = {44100.0, kAudioFormatMPEG4AAC, 0, 0, 1024, 0, thisNumChannels, 0, 0};
-        
-        CheckError(ExtAudioFileCreateWithURL(audioFileRef, kAudioFileM4AType, &outputFileDesc, NULL, kAudioFileFlags_EraseFile, &_outputFile), "Creating file");
-        
-        
-        // Set a few defaults and presets
-        self.samplingRate = thisSamplingRate;
-        self.numChannels = thisNumChannels;
-        self.currentTime = 0.0;
-        self.latency = .011609977; // 512 samples / ( 44100 samples / sec ) default
-        
-        
-        // We're going to impose a format upon the input file
-        // Single-channel float does the trick.
-        _outputFormat.mSampleRate = self.samplingRate;
-        _outputFormat.mFormatID = kAudioFormatLinearPCM;
-        _outputFormat.mFormatFlags = kAudioFormatFlagIsFloat;
-        _outputFormat.mBytesPerPacket = 4*self.numChannels;
-        _outputFormat.mFramesPerPacket = 1;
-        _outputFormat.mBytesPerFrame = 4*self.numChannels;
-        _outputFormat.mChannelsPerFrame = self.numChannels;
-        _outputFormat.mBitsPerChannel = 32;
-        
-        // Apply the format to our file
-        ExtAudioFileSetProperty(_outputFile, kExtAudioFileProperty_ClientDataFormat, sizeof(AudioStreamBasicDescription), &_outputFormat);
-        
-        
-        // Arbitrary buffer sizes that don't matter so much as long as they're "big enough"
-        self.outputBuffer = (float *)calloc(2*self.samplingRate, sizeof(float));
-        self.holdingBuffer = (float *)calloc(2*self.samplingRate, sizeof(float));
-        
-        pthread_mutex_init(&outputAudioFileLock, NULL);
-        
-        // mutex here //
-        if( 0 == pthread_mutex_trylock( &outputAudioFileLock ) ) 
-        {       
-            CheckError( ExtAudioFileWriteAsync(self.outputFile, 0, NULL), "Initializing audio file");
-        }
-        pthread_mutex_unlock( &outputAudioFileLock );
-        
-    }
-    return self;
-}
-
-- (void)writeNewAudio:(float *)newData numFrames:(UInt32)thisNumFrames numChannels:(UInt32)thisNumChannels
-{
-    UInt32 numIncomingBytes = thisNumFrames*thisNumChannels*sizeof(float);
-    memcpy(self.outputBuffer, newData, numIncomingBytes);
-    
-    AudioBufferList outgoingAudio;
-    outgoingAudio.mNumberBuffers = 1;
-    outgoingAudio.mBuffers[0].mNumberChannels = thisNumChannels;
-    outgoingAudio.mBuffers[0].mDataByteSize = numIncomingBytes;
-    outgoingAudio.mBuffers[0].mData = self.outputBuffer;
-    
-    if( 0 == pthread_mutex_trylock( &outputAudioFileLock ) ) 
-    {       
-        ExtAudioFileWriteAsync(self.outputFile, thisNumFrames, &outgoingAudio);
-    }
-    pthread_mutex_unlock( &outputAudioFileLock );
-    
-    // Figure out where we are in the file
-    SInt64 frameOffset = 0;
-    ExtAudioFileTell(self.outputFile, &frameOffset);
-    self.currentTime = (float)frameOffset / self.samplingRate;
-    
-}
-
-
-- (float)getDuration
-{
-    // We're going to directly calculate the duration of the audio file (in seconds)
-    SInt64 framesInThisFile;
-    UInt32 propertySize = sizeof(framesInThisFile);
-    ExtAudioFileGetProperty(self.outputFile, kExtAudioFileProperty_FileLengthFrames, &propertySize, &framesInThisFile);
-    
-    AudioStreamBasicDescription fileStreamFormat;
-    propertySize = sizeof(AudioStreamBasicDescription);
-    ExtAudioFileGetProperty(self.outputFile, kExtAudioFileProperty_FileDataFormat, &propertySize, &fileStreamFormat);
-    
-    return (float)framesInThisFile/(float)fileStreamFormat.mSampleRate;
-    
-}
-
-
-
-- (void)configureWriterCallback
-{
-    
-    if (!self.callbackTimer)
-    {
-        self.callbackTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
-    }
-    
-    if (self.callbackTimer)
-    {
-        UInt32 numSamplesPerCallback = (UInt32)( self.latency * self.samplingRate );
-        dispatch_source_set_timer(self.callbackTimer, dispatch_walltime(NULL, 0), self.latency*NSEC_PER_SEC, 0);
-        dispatch_source_set_event_handler(self.callbackTimer, ^{
-            
-            
-            if (self.writerBlock) {                
-                // Call out with the audio that we've got.
-                self.writerBlock(self.outputBuffer, numSamplesPerCallback, self.numChannels);
-                
-                // Get audio from the block supplier
-                [self writeNewAudio:self.outputBuffer numFrames:numSamplesPerCallback numChannels:self.numChannels];
-                
-            }
-            
-        });
-        
-    }
-    
-}
-
-
-
-- (void)record;
-{
-    
-    // Configure (or if necessary, create and start) the timer for retrieving MP3 audio
-    [self configureWriterCallback];
-    
-    if (!self.recording)
-    {
-        dispatch_resume(self.callbackTimer);
-        self.recording = TRUE;
-    }
-    
-}
-
-- (void)stop
-{
-    // Close the
-    pthread_mutex_lock( &outputAudioFileLock );
-    ExtAudioFileDispose(self.outputFile);
-    pthread_mutex_unlock( &outputAudioFileLock );
-    self.recording = FALSE;
-}
-
-- (void)pause
-{
-    // Pause the dispatch timer for retrieving the MP3 audio
-    if (self.callbackTimer) {
-        dispatch_suspend(self.callbackTimer);
-        self.recording = FALSE;
-    }
-}
-
-
-
-@end
-
diff --git a/Novocaine/Novocaine.h b/Novocaine/Novocaine.h
deleted file mode 100644
index a5a99a1..0000000
--- a/Novocaine/Novocaine.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-#import <CoreFoundation/CoreFoundation.h>
-#import <AudioToolbox/AudioToolbox.h>
-#import <Accelerate/Accelerate.h>
-
-#if defined __MAC_OS_X_VERSION_MAX_ALLOWED
-    #define USING_OSX 
-    #include <CoreAudio/CoreAudio.h>
-#else
-    #define USING_IOS
-    #include <AVFoundation/AVFoundation.h>
-#endif
-
-#if defined (USING_IOS)
-    #import <UIKit/UIKit.h>
-#endif
-
-#include <Block.h>
-
-FOUNDATION_EXTERN void CheckError(OSStatus error, const char *operation);
-
-typedef void (^NovocaineOutputBlock)(float *data, UInt32 numFrames, UInt32 numChannels);
-typedef void (^NovocaineInputBlock)(float *data, UInt32 numFrames, UInt32 numChannels);
-
-#if defined (USING_IOS)
-@interface Novocaine : NSObject <UIAlertViewDelegate>
-#elif defined (USING_OSX)
-@interface Novocaine : NSObject
-#endif
-
-// ------ These properties/methods are used for configuration -------
-
-@property (nonatomic, copy)     NSString *inputRoute;
-
-// TODO: Not yet implemented. No effect right now.
-//@property (nonatomic, assign)   BOOL inputEnabled;
-
-#ifdef USING_IOS
-@property (nonatomic, assign)   BOOL forceOutputToSpeaker;
-#endif
-
-// Explicitly declaring the block setters will create the correct block signature for auto-complete.
-// These will map to the setters for the block properties below.
-- (void)setInputBlock:(NovocaineInputBlock)block;
-- (void)setOutputBlock:(NovocaineOutputBlock)block;
-
-@property (nonatomic, copy) NovocaineOutputBlock outputBlock;
-@property (nonatomic, copy) NovocaineInputBlock inputBlock;
-
-// ------------------------------------------------------------------
-
-// these should be readonly in public interface - no need for public write access
-@property (nonatomic, assign, readonly) AudioUnit inputUnit;
-@property (nonatomic, assign, readonly) AudioUnit outputUnit;
-@property (nonatomic, assign, readonly) AudioBufferList *inputBuffer;
-@property (nonatomic, assign, readonly) BOOL inputAvailable;
-@property (nonatomic, assign, readonly) UInt32 numInputChannels;
-@property (nonatomic, assign, readonly) UInt32 numOutputChannels;
-@property (nonatomic, assign, readonly) Float64 samplingRate;
-@property (nonatomic, assign, readonly) BOOL isInterleaved;
-@property (nonatomic, assign, readonly) UInt32 numBytesPerSample;
-@property (nonatomic, assign, readonly) AudioStreamBasicDescription inputFormat;
-@property (nonatomic, assign, readonly) AudioStreamBasicDescription outputFormat;
-@property (nonatomic, assign, readonly) BOOL playing;
-
-// @property BOOL playThroughEnabled;
-
-
-// Singleton methods
-+ (Novocaine *) audioManager;
-
-// Audio Unit methods
-- (void)play;
-- (void)pause;
-
-#if defined ( USING_IOS )
-- (void)checkSessionProperties;
-- (void)checkAudioSource;
-#endif
-
-
-@end
diff --git a/Novocaine/Novocaine.m b/Novocaine/Novocaine.m
deleted file mode 100644
index 3161d73..0000000
--- a/Novocaine/Novocaine.m
+++ /dev/null
@@ -1,1021 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-//
-// TODO:
-// Switching mic and speaker on/off
-//
-// HOUSEKEEPING AND NICE FEATURES:
-// Disambiguate outputFormat (the AUHAL's stream format)
-// More nuanced input detection on the Mac
-// Route switching should work, check with iPhone
-// Device switching should work, check with laptop. Read that damn book.
-// Wrap logging with debug macros.
-// Think about what should be public, what private.
-// Ability to select non-default devices.
-
-
-#import "Novocaine.h"
-#define kInputBus 1
-#define kOutputBus 0
-#define kDefaultDevice 999999
-
-#import "TargetConditionals.h"
-
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-	
-    void CheckError(OSStatus error, const char *operation)
-    {
-        if (error == noErr) return;
-        
-        char str[20];
-        // see if it appears to be a 4-char-code
-        *(UInt32 *)(str + 1) = CFSwapInt32HostToBig(error);
-        if (isprint(str[1]) && isprint(str[2]) && isprint(str[3]) && isprint(str[4])) {
-            str[0] = str[5] = '\'';
-            str[6] = '\0';
-        } else
-            // no, format it as an integer
-            sprintf(str, "%d", (int)error);
-        
-        fprintf(stderr, "Error: %s (%s)\n", operation, str);
-        
-        exit(1);
-    }
-    
-    
-    OSStatus inputCallback (void						*inRefCon,
-                            AudioUnitRenderActionFlags	* ioActionFlags,
-                            const AudioTimeStamp 		* inTimeStamp,
-                            UInt32						inOutputBusNumber,
-                            UInt32						inNumberFrames,
-                            AudioBufferList				* ioData);
-    
-    OSStatus renderCallback (void						*inRefCon,
-                             AudioUnitRenderActionFlags	* ioActionFlags,
-                             const AudioTimeStamp 		* inTimeStamp,
-                             UInt32						inOutputBusNumber,
-                             UInt32						inNumberFrames,
-                             AudioBufferList				* ioData);
-    
-    
-#if defined (USING_IOS)
-    void sessionPropertyListener(void *                  inClientData,
-                                 AudioSessionPropertyID  inID,
-                                 UInt32                  inDataSize,
-                                 const void *            inData);
-    
-#endif
-    
-    
-    void sessionInterruptionListener(void *inClientData, UInt32 inInterruption);
-    
-#ifdef __cplusplus
-}
-#endif
-
-
-
-static Novocaine *audioManager = nil;
-
-@interface Novocaine()
-
-// redeclare readwrite for class continuation
-@property (nonatomic, assign, readwrite) AudioUnit inputUnit;
-@property (nonatomic, assign, readwrite) AudioUnit outputUnit;
-@property (nonatomic, assign, readwrite) AudioBufferList *inputBuffer;
-@property (nonatomic, assign, readwrite) BOOL inputAvailable;
-@property (nonatomic, assign, readwrite) UInt32 numInputChannels;
-@property (nonatomic, assign, readwrite) UInt32 numOutputChannels;
-@property (nonatomic, assign, readwrite) Float64 samplingRate;
-@property (nonatomic, assign, readwrite) BOOL isInterleaved;
-@property (nonatomic, assign, readwrite) UInt32 numBytesPerSample;
-@property (nonatomic, assign, readwrite) AudioStreamBasicDescription inputFormat;
-@property (nonatomic, assign, readwrite) AudioStreamBasicDescription outputFormat;
-@property (nonatomic, assign, readwrite) BOOL playing;
-@property (nonatomic, assign, readwrite) float *inData;
-@property (nonatomic, assign, readwrite) float *outData;
-
-#if defined (USING_OSX)
-@property (nonatomic, assign) AudioDeviceID *deviceIDs;
-@property (nonatomic, strong) NSMutableArray *deviceNames;
-@property (nonatomic, assign) AudioDeviceID defaultInputDeviceID;
-@property (nonatomic, strong) NSString *defaultInputDeviceName;
-@property (nonatomic, assign) AudioDeviceID defaultOutputDeviceID;
-@property (nonatomic, strong) NSString *defaultOutputDeviceName;
-- (void)enumerateAudioDevices;
-#endif
-
-// must be called prior to playing audio
-- (void)setupAudioSession;
-- (void)setupAudioUnits;
-
-- (NSString *)applicationDocumentsDirectory;
-
-- (void)freeBuffers;
-
-@end
-
-
-@implementation Novocaine
-
-#pragma mark - Singleton Methods
-+ (Novocaine *) audioManager
-{
-	@synchronized(self)
-	{
-		if (audioManager == nil) {
-			audioManager = [[Novocaine alloc] init];
-		}
-	}
-    return audioManager;
-}
-
-+ (id)allocWithZone:(NSZone *)zone {
-    @synchronized(self) {
-        if (audioManager == nil) {
-            audioManager = [super allocWithZone:zone];
-            return audioManager;  // assignment and return on first allocation
-        }
-    }
-    return nil; // on subsequent allocation attempts return nil
-}
-
-// ND: If NSCopying protocol is to be supported, it should be declared with class and done correctly. Disabled for now.
-
-//- (id)copyWithZone:(NSZone *)zone
-//{
-//    return self;
-//}
-
-- (id)init
-{
-	if (self = [super init])
-	{
-        
-        // Initialize a float buffer to hold audio
-		self.inData  = (float *)calloc(8192, sizeof(float)); // probably more than we'll need
-        self.outData = (float *)calloc(8192, sizeof(float));
-        
-        self.inputBlock = nil;
-        self.outputBlock = nil;
-        
-#if defined ( USING_OSX )
-        self.deviceNames = [[NSMutableArray alloc] initWithCapacity:100]; // more than we'll need
-#endif
-        
-        self.playing = NO;
-        // self.playThroughEnabled = NO;
-		
-		// Fire up the audio session ( with steady error checking ... )
-        [self setupAudioSession];
-        
-        // start audio units
-        [self setupAudioUnits];
-		
-		return self;
-		
-	}
-	
-	return nil;
-}
-
-- (void)dealloc
-{
-    free(self.inData);
-    free(self.outData);
-    
-#if defined (USING_OSX)
-    if (self.deviceIDs){
-        free(self.deviceIDs);
-    }
-#endif
-    
-    [self freeBuffers];
-}
-
-- (void)freeBuffers
-{
-    if (self.inputBuffer){
-        
-		for(UInt32 i =0; i< self.inputBuffer->mNumberBuffers ; i++) {
-
-			if(self.inputBuffer->mBuffers[i].mData){
-                free(self.inputBuffer->mBuffers[i].mData);
-            }
-		}
-        
-        free(self.inputBuffer);
-        self.inputBuffer = NULL;
-    }
-}
-
-#pragma mark - Properties
-
-// TODO: Implement this.
-//- (void)setInputEnabled:(BOOL)inputEnabled
-//{
-//    _inputEnabled = inputEnabled;
-//}
-
-#ifdef USING_IOS
-- (void)setForceOutputToSpeaker:(BOOL)forceOutputToSpeaker
-{
-    
-#if !TARGET_IPHONE_SIMULATOR
-    UInt32 value = forceOutputToSpeaker ? 1 : 0;
-    // should not be fatal error
-    OSStatus err = AudioSessionSetProperty(kAudioSessionProperty_OverrideCategoryDefaultToSpeaker, sizeof(UInt32), &value);
-    if (err != noErr){
-        NSLog(@"Could not override audio output route to speaker");
-    }
-    else{
-        _forceOutputToSpeaker = forceOutputToSpeaker;
-    }
-#else
-    _forceOutputToSpeaker = forceOutputToSpeaker;
-#endif
-}
-#endif
-
-#pragma mark - Audio Methods
-
-
-- (void)setupAudioSession
-{
-    // Initialize and configure the audio session, and add an interuption listener
-    
-#if defined ( USING_IOS )
-    
-    // Set the audio session active
-    NSError *err = nil;
-    if (![[AVAudioSession sharedInstance] setActive:YES error:&err]){
-        NSLog(@"Couldn't activate audio session: %@", err);
-    }
-    [self checkAudioSource];
-#elif defined ( USING_OSX )
-    // TODO: grab the audio device
-    [self enumerateAudioDevices];
-    self.inputAvailable = YES;
-#endif
-}
-
-
-- (void)setupAudioUnits
-{
-    
-    // --- Audio Session Setup ---
-    // ---------------------------
-    
-#if defined ( USING_IOS )
-    
-    // TODO: Move this somewhere more dynamic - should update category as appropriate to current application behavior
-    UInt32 sessionCategory = kAudioSessionCategory_PlayAndRecord;
-    CheckError( AudioSessionSetProperty (kAudioSessionProperty_AudioCategory,
-                                         sizeof (sessionCategory),
-                                         &sessionCategory), "Couldn't set audio category");    
-    
-    
-    // Add a property listener, to listen to changes to the session
-    CheckError( AudioSessionAddPropertyListener(kAudioSessionProperty_AudioRouteChange, sessionPropertyListener, (__bridge void*)self), "Couldn't add audio session property listener");
-    
-    // Set the buffer size, this will affect the number of samples that get rendered every time the audio callback is fired
-    // A small number will get you lower latency audio, but will make your processor work harder
-#if !TARGET_IPHONE_SIMULATOR
-    Float32 preferredBufferSize = 0.0232;
-    CheckError( AudioSessionSetProperty(kAudioSessionProperty_PreferredHardwareIOBufferDuration, sizeof(preferredBufferSize), &preferredBufferSize), "Couldn't set the preferred buffer duration");
-#endif
-
-    
-    [self checkSessionProperties];
-    
-#endif
-    
-    // ----- Audio Unit Setup -----
-    // ----------------------------
-    
-    
-    // Describe the output unit.
-    
-#if defined ( USING_OSX )
-    AudioComponentDescription inputDescription = {0};	
-    inputDescription.componentType = kAudioUnitType_Output;
-    inputDescription.componentSubType = kAudioUnitSubType_HALOutput;
-    inputDescription.componentManufacturer = kAudioUnitManufacturer_Apple;
-    
-    AudioComponentDescription outputDescription = {0};	
-    outputDescription.componentType = kAudioUnitType_Output;
-    outputDescription.componentSubType = kAudioUnitSubType_HALOutput;
-    outputDescription.componentManufacturer = kAudioUnitManufacturer_Apple;    
-    
-#elif defined (USING_IOS)
-    AudioComponentDescription inputDescription = {0};	
-    inputDescription.componentType = kAudioUnitType_Output;
-    inputDescription.componentSubType = kAudioUnitSubType_RemoteIO;
-    inputDescription.componentManufacturer = kAudioUnitManufacturer_Apple;
-    
-#endif
-    
-    
-    
-    // Get component
-    AudioComponent inputComponent = AudioComponentFindNext(NULL, &inputDescription);
-    CheckError( AudioComponentInstanceNew(inputComponent, &_inputUnit), "Couldn't create the output audio unit");
-    
-#if defined ( USING_OSX )
-    AudioComponent outputComponent = AudioComponentFindNext(NULL, &outputDescription);
-    CheckError( AudioComponentInstanceNew(outputComponent, &_outputUnit), "Couldn't create the output audio unit");
-#endif
-    
-    // Enable input
-    // TODO: Conditionally disable input if option has not been specified
-    UInt32 one = 1;
-    CheckError( AudioUnitSetProperty(_inputUnit,
-                                     kAudioOutputUnitProperty_EnableIO,
-                                     kAudioUnitScope_Input,
-                                     kInputBus,
-                                     &one,
-                                     sizeof(one)), "Couldn't enable IO on the input scope of output unit");
-    
-    
-#if defined ( USING_OSX )    
-    // Disable output on the input unit
-    // (only on Mac, since on the iPhone, the input unit is also the output unit)
-    UInt32 zero = 0;
-    CheckError( AudioUnitSetProperty(_inputUnit,
-                                     kAudioOutputUnitProperty_EnableIO, 
-                                     kAudioUnitScope_Output, 
-                                     kOutputBus, 
-                                     &zero, 
-                                     sizeof(UInt32)), "Couldn't disable output on the audio unit");
-    
-    // Enable output
-    CheckError( AudioUnitSetProperty(_outputUnit,
-                                     kAudioOutputUnitProperty_EnableIO, 
-                                     kAudioUnitScope_Output, 
-                                     kOutputBus, 
-                                     &one, 
-                                     sizeof(one)), "Couldn't enable IO on the input scope of output unit");
-    
-    // Disable input
-    CheckError( AudioUnitSetProperty(_outputUnit,
-                                     kAudioOutputUnitProperty_EnableIO, 
-                                     kAudioUnitScope_Input, 
-                                     kInputBus, 
-                                     &zero, 
-                                     sizeof(UInt32)), "Couldn't disable output on the audio unit");
-    
-#endif
-    
-    // TODO: first query the hardware for desired stream descriptions
-    // Check the input stream format
-    
-# if defined ( USING_IOS )
-    UInt32 size;
-	size = sizeof( AudioStreamBasicDescription );
-	CheckError( AudioUnitGetProperty(_inputUnit,
-                                     kAudioUnitProperty_StreamFormat, 
-                                     kAudioUnitScope_Input, 
-                                     1, 
-                                     &_inputFormat,
-                                     &size ),
-               "Couldn't get the hardware input stream format");
-	
-	// Check the output stream format
-	size = sizeof( AudioStreamBasicDescription );
-	CheckError( AudioUnitGetProperty(_inputUnit,
-                                     kAudioUnitProperty_StreamFormat, 
-                                     kAudioUnitScope_Output, 
-                                     1, 
-                                     &_outputFormat,
-                                     &size ), 
-               "Couldn't get the hardware output stream format");
-    
-    // TODO: check this works on iOS!
-    _inputFormat.mSampleRate = 44100.0;
-    _outputFormat.mSampleRate = 44100.0;
-    self.samplingRate = _inputFormat.mSampleRate;
-    self.numBytesPerSample = _inputFormat.mBitsPerChannel / 8;
-    
-    size = sizeof(AudioStreamBasicDescription);
-	CheckError(AudioUnitSetProperty(_inputUnit,
-									kAudioUnitProperty_StreamFormat,
-									kAudioUnitScope_Output,
-									kInputBus,
-									&_outputFormat,
-									size),
-			   "Couldn't set the ASBD on the audio unit (after setting its sampling rate)");
-    
-    
-# elif defined ( USING_OSX )
-    
-    UInt32 size = sizeof(AudioDeviceID);
-    if(self.defaultInputDeviceID == kAudioDeviceUnknown)
-    {
-        AudioObjectPropertyAddress propertyAddress;
-        propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice;
-        propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-        propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-        
-        AudioDeviceID thisDeviceID;            
-        UInt32 propsize = sizeof(AudioDeviceID);
-        CheckError(AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propsize, &thisDeviceID), "Could not get the default device");
-        self.defaultInputDeviceID = thisDeviceID;
-    }
-    
-    if (self.defaultOutputDeviceID == kAudioDeviceUnknown)
-    {
-        AudioObjectPropertyAddress propertyAddress;
-        propertyAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice;
-        propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-        propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-        
-        AudioDeviceID thisDeviceID;            
-        UInt32 propsize = sizeof(AudioDeviceID);
-        CheckError(AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propsize, &thisDeviceID), "Could not get the default device");
-        self.defaultOutputDeviceID = thisDeviceID;
-        
-    }
-    
-    
-    // Set the current device to the default input unit.
-    CheckError( AudioUnitSetProperty( _inputUnit, 
-                                     kAudioOutputUnitProperty_CurrentDevice, 
-                                     kAudioUnitScope_Global, 
-                                     kOutputBus, 
-                                     &_defaultInputDeviceID,
-                                     sizeof(AudioDeviceID) ), "Couldn't set the current input audio device");
-    
-    CheckError( AudioUnitSetProperty( _outputUnit,
-                                     kAudioOutputUnitProperty_CurrentDevice, 
-                                     kAudioUnitScope_Global, 
-                                     kOutputBus, 
-                                     &_defaultOutputDeviceID,
-                                     sizeof(AudioDeviceID) ), "Couldn't set the current output audio device");
-    
-    
-	UInt32 propertySize = sizeof(AudioStreamBasicDescription);
-	CheckError(AudioUnitGetProperty(_inputUnit,
-									kAudioUnitProperty_StreamFormat,
-									kAudioUnitScope_Output,
-									kInputBus,
-									&_outputFormat,
-									&propertySize),
-			   "Couldn't get ASBD from input unit");
-    
-    
-	// 9/6/10 - check the input device's stream format
-	CheckError(AudioUnitGetProperty(_inputUnit,
-									kAudioUnitProperty_StreamFormat,
-									kAudioUnitScope_Input,
-									kInputBus,
-									&_inputFormat,
-									&propertySize),
-			   "Couldn't get ASBD from input unit");
-    
-    
-    _outputFormat.mSampleRate = _inputFormat.mSampleRate;
-//    outputFormat.mFormatFlags =  kAudioFormatFlagsCanonical;
-    self.samplingRate = _inputFormat.mSampleRate;
-    self.numBytesPerSample = _inputFormat.mBitsPerChannel / 8;
-    
-    self.numInputChannels = _inputFormat.mChannelsPerFrame;
-    self.numOutputChannels = _outputFormat.mChannelsPerFrame;
-    
-    propertySize = sizeof(AudioStreamBasicDescription);
-	CheckError(AudioUnitSetProperty(_inputUnit,
-									kAudioUnitProperty_StreamFormat,
-									kAudioUnitScope_Output,
-									kInputBus,
-									&_outputFormat,
-									propertySize),
-			   "Couldn't set the ASBD on the audio unit (after setting its sampling rate)");
-    
-    
-#endif
-    
-    
-    
-#if defined ( USING_IOS )
-    UInt32 numFramesPerBuffer;
-    size = sizeof(UInt32);
-    CheckError(AudioUnitGetProperty(_inputUnit,
-                                    kAudioUnitProperty_MaximumFramesPerSlice,
-                                    kAudioUnitScope_Global, 
-                                    kOutputBus, 
-                                    &numFramesPerBuffer, 
-                                    &size), 
-               "Couldn't get the number of frames per callback");
-    
-    UInt32 bufferSizeBytes = _outputFormat.mBytesPerFrame * _outputFormat.mFramesPerPacket * numFramesPerBuffer;
-    
-#elif defined ( USING_OSX )
-	// Get the size of the IO buffer(s)
-	UInt32 bufferSizeFrames = 0;
-	size = sizeof(UInt32);
-	CheckError (AudioUnitGetProperty(self.inputUnit,
-									 kAudioDevicePropertyBufferFrameSize,
-									 kAudioUnitScope_Global,
-									 0,
-									 &bufferSizeFrames,
-									 &size),
-				"Couldn't get buffer frame size from input unit");
-	UInt32 bufferSizeBytes = bufferSizeFrames * sizeof(Float32);
-#endif
-    
-    
-    
-	if (_outputFormat.mFormatFlags & kAudioFormatFlagIsNonInterleaved) {
-        // The audio is non-interleaved
-        printf("Not interleaved!\n");
-        self.isInterleaved = NO;
-        
-        // allocate an AudioBufferList plus enough space for array of AudioBuffers
-		UInt32 propsize = offsetof(AudioBufferList, mBuffers[0]) + (sizeof(AudioBuffer) * _outputFormat.mChannelsPerFrame);
-		
-		//malloc buffer lists
-		self.inputBuffer = (AudioBufferList *)malloc(propsize);
-		self.inputBuffer->mNumberBuffers = _outputFormat.mChannelsPerFrame;
-		
-		//pre-malloc buffers for AudioBufferLists
-		for(UInt32 i =0; i< self.inputBuffer->mNumberBuffers ; i++) {
-			self.inputBuffer->mBuffers[i].mNumberChannels = 1;
-			self.inputBuffer->mBuffers[i].mDataByteSize = bufferSizeBytes;
-			self.inputBuffer->mBuffers[i].mData = malloc(bufferSizeBytes);
-            memset(self.inputBuffer->mBuffers[i].mData, 0, bufferSizeBytes);
-		}
-        
-	} else {
-		printf ("Format is interleaved\n");
-        self.isInterleaved = YES;
-        
-		// allocate an AudioBufferList plus enough space for array of AudioBuffers
-		UInt32 propsize = offsetof(AudioBufferList, mBuffers[0]) + (sizeof(AudioBuffer) * 1);
-		
-		//malloc buffer lists
-		self.inputBuffer = (AudioBufferList *)malloc(propsize);
-		self.inputBuffer->mNumberBuffers = 1;
-		
-		//pre-malloc buffers for AudioBufferLists
-		self.inputBuffer->mBuffers[0].mNumberChannels = _outputFormat.mChannelsPerFrame;
-		self.inputBuffer->mBuffers[0].mDataByteSize = bufferSizeBytes;
-		self.inputBuffer->mBuffers[0].mData = malloc(bufferSizeBytes);
-        memset(self.inputBuffer->mBuffers[0].mData, 0, bufferSizeBytes);
-        
-	}
-    
-    
-    // Slap a render callback on the unit
-    AURenderCallbackStruct callbackStruct;
-    callbackStruct.inputProc = inputCallback;
-    callbackStruct.inputProcRefCon = (__bridge void *)(self);
-    
-    CheckError( AudioUnitSetProperty(_inputUnit,
-                                     kAudioOutputUnitProperty_SetInputCallback, 
-                                     kAudioUnitScope_Global,
-                                     0, 
-                                     &callbackStruct, 
-                                     sizeof(callbackStruct)), "Couldn't set the callback on the input unit");
-    
-    
-    callbackStruct.inputProc = renderCallback;
-    callbackStruct.inputProcRefCon = (__bridge void *)(self);
-# if defined ( USING_OSX )    
-    CheckError( AudioUnitSetProperty(_outputUnit,
-                                     kAudioUnitProperty_SetRenderCallback, 
-                                     kAudioUnitScope_Input,
-                                     0,
-                                     &callbackStruct, 
-                                     sizeof(callbackStruct)), 
-               "Couldn't set the render callback on the input unit");
-    
-#elif defined ( USING_IOS )
-    CheckError( AudioUnitSetProperty(_inputUnit,
-                                     kAudioUnitProperty_SetRenderCallback, 
-                                     kAudioUnitScope_Input,
-                                     0,
-                                     &callbackStruct, 
-                                     sizeof(callbackStruct)), 
-               "Couldn't set the render callback on the input unit");    
-#endif
-    
-    
-    
-    
-	CheckError(AudioUnitInitialize(_inputUnit), "Couldn't initialize the output unit");
-#if defined ( USING_OSX )
-    CheckError(AudioUnitInitialize(_outputUnit), "Couldn't initialize the output unit");
-#endif
-    
-}
-
-#if defined (USING_OSX)
-- (void)enumerateAudioDevices
-{
-    AudioObjectPropertyAddress propertyAddress;
-    propertyAddress.mSelector = kAudioHardwarePropertyDefaultInputDevice;
-    propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-    propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-    
-    UInt32 propSize = sizeof(AudioDeviceID);
-    CheckError(AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propSize, &_defaultInputDeviceID), "Could not get the default device");
-    
-    propertyAddress.mSelector = kAudioHardwarePropertyDevices;
-    propertyAddress.mScope = kAudioObjectPropertyScopeGlobal;
-    propertyAddress.mElement = kAudioObjectPropertyElementMaster;
-    
-    AudioObjectGetPropertyDataSize(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propSize);
-    uint32_t deviceCount = ( propSize / sizeof(AudioDeviceID) );
-    
-    // Allocate the device IDs
-    _deviceIDs = (AudioDeviceID *)calloc(deviceCount, sizeof(AudioDeviceID));
-    [_deviceNames removeAllObjects];
-    
-    // Get all the device IDs
-    CheckError( AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &propSize, _deviceIDs ), "Could not get device IDs");
-    
-    
-    // Get the names of all the device IDs
-    // 256 chars should be big enough for pretty much any name
-    char deviceNameBuffer[256];
-    char mfrNameBuffer[256];
-    UInt32 nameBufSize;
-    AudioObjectPropertyAddress deviceAddress;
-    
-    for( int i = 0; i < deviceCount; i++ )
-    {
-        deviceAddress.mSelector = kAudioDevicePropertyDeviceName;
-        deviceAddress.mScope = kAudioObjectPropertyScopeGlobal;
-        deviceAddress.mElement = kAudioObjectPropertyElementMaster;
-        
-        nameBufSize = sizeof(deviceNameBuffer);
-        
-        CheckError( AudioObjectGetPropertyData(self.deviceIDs[i], &deviceAddress, 0, NULL, &nameBufSize, deviceNameBuffer), "Could not get device name");
-
-        deviceAddress.mSelector = kAudioDevicePropertyDeviceManufacturer;
-        deviceAddress.mScope = kAudioObjectPropertyScopeGlobal;
-        deviceAddress.mElement = kAudioObjectPropertyElementMaster;
-        
-        nameBufSize = sizeof(mfrNameBuffer);
-        
-        CheckError( AudioObjectGetPropertyData(self.deviceIDs[i], &deviceAddress, 0, NULL, &nameBufSize, mfrNameBuffer), "Could not get device manufacturer");
-        
-        NSString *thisDeviceName = [NSString stringWithFormat:@"%@: %@", [NSString stringWithUTF8String:mfrNameBuffer], [NSString stringWithUTF8String:deviceNameBuffer]];
-        NSLog(@"Device: %@, ID: %d", thisDeviceName, self.deviceIDs[i]);
-        [self.deviceNames addObject:thisDeviceName];
-    }
-    
-}
-
-#endif
-
-
-
-- (void)pause {
-	
-	if (self.playing) {
-        CheckError( AudioOutputUnitStop(_inputUnit), "Couldn't stop the output unit");
-#if defined ( USING_OSX )
-		CheckError( AudioOutputUnitStop(_outputUnit), "Couldn't stop the output unit");
-#endif
-		self.playing = NO;
-	}
-    
-}
-
-- (void)play {
-	
-	UInt32 isInputAvailable=0;
-    
-#if defined ( USING_IOS )
-    UInt32 size = sizeof(isInputAvailable);
-	CheckError( AudioSessionGetProperty(kAudioSessionProperty_AudioInputAvailable, 
-                                        &size, 
-                                        &isInputAvailable), "Couldn't check if input was available");
-    
-#elif defined ( USING_OSX )
-    isInputAvailable = 1;
-    
-#endif
-    
-    self.inputAvailable = isInputAvailable;
-    
-	if ( self.inputAvailable ) {
-		// Set the audio session category for simultaneous play and record
-		if (!self.playing) {
-			CheckError( AudioOutputUnitStart(_inputUnit), "Couldn't start the output unit");
-#if defined ( USING_OSX )
-            CheckError( AudioOutputUnitStart(_outputUnit), "Couldn't start the output unit");
-#endif
-            
-            self.playing = YES;
-            
-		}
-	}
-    
-}
-
-
-#pragma mark - Render Methods
-OSStatus inputCallback   (void						*inRefCon,
-                          AudioUnitRenderActionFlags	* ioActionFlags,
-                          const AudioTimeStamp 		* inTimeStamp,
-                          UInt32						inOutputBusNumber,
-                          UInt32						inNumberFrames,
-                          AudioBufferList			* ioData)
-{
-    @autoreleasepool {
-    
-        Novocaine *sm = (__bridge Novocaine *)inRefCon;
-        
-        if (!sm.playing)
-            return noErr;
-        if (sm.inputBlock == nil)
-            return noErr;    
-        
-        
-        // Check the current number of channels		
-        // Let's actually grab the audio
-#if TARGET_IPHONE_SIMULATOR
-        // this is a workaround for an issue with core audio on the simulator, //
-        //  likely due to 44100 vs 48000 difference in OSX //
-        if( inNumberFrames == 471 )
-            inNumberFrames = 470;
-#endif
-        CheckError( AudioUnitRender(sm.inputUnit, ioActionFlags, inTimeStamp, inOutputBusNumber, inNumberFrames, sm.inputBuffer), "Couldn't render the output unit");
-        
-        
-        // Convert the audio in something manageable
-        // For Float32s ... 
-        if ( sm.numBytesPerSample == 4 ) // then we've already got flaots
-        {
-            
-            float zero = 0.0f;
-            if ( ! sm.isInterleaved ) { // if the data is in separate buffers, make it interleaved
-                for (int i=0; i < sm.numInputChannels; ++i) {
-                    vDSP_vsadd((float *)sm.inputBuffer->mBuffers[i].mData, 1, &zero, sm.inData+i, 
-                               sm.numInputChannels, inNumberFrames);
-                }
-            } 
-            else { // if the data is already interleaved, copy it all in one happy block.
-                // TODO: check mDataByteSize is proper 
-                memcpy(sm.inData, (float *)sm.inputBuffer->mBuffers[0].mData, sm.inputBuffer->mBuffers[0].mDataByteSize);
-            }
-        }
-        
-        // For SInt16s ...
-        else if ( sm.numBytesPerSample == 2 ) // then we're dealing with SInt16's
-        {
-            if ( ! sm.isInterleaved ) {
-                for (int i=0; i < sm.numInputChannels; ++i) {
-                    vDSP_vflt16((SInt16 *)sm.inputBuffer->mBuffers[i].mData, 1, sm.inData+i, sm.numInputChannels, inNumberFrames);
-                }            
-            }
-            else {
-                vDSP_vflt16((SInt16 *)sm.inputBuffer->mBuffers[0].mData, 1, sm.inData, 1, inNumberFrames*sm.numInputChannels);
-            }
-            
-            float scale = 1.0 / (float)INT16_MAX;
-            vDSP_vsmul(sm.inData, 1, &scale, sm.inData, 1, inNumberFrames*sm.numInputChannels);
-        }
-        
-        // Now do the processing! 
-        sm.inputBlock(sm.inData, inNumberFrames, sm.numInputChannels);
-        
-    }
-    
-    return noErr;
-	
-	
-}
-
-OSStatus renderCallback (void						*inRefCon,
-                         AudioUnitRenderActionFlags	* ioActionFlags,
-                         const AudioTimeStamp 		* inTimeStamp,
-                         UInt32						inOutputBusNumber,
-                         UInt32						inNumberFrames,
-                         AudioBufferList				* ioData)
-{
-    // autorelease pool for much faster ARC performance on repeated calls from separate thread
-    @autoreleasepool {
-        
-        Novocaine *sm = (__bridge Novocaine *)inRefCon;
-        float zero = 0.0;
-        
-        
-        for (int iBuffer=0; iBuffer < ioData->mNumberBuffers; ++iBuffer) {
-            memset(ioData->mBuffers[iBuffer].mData, 0, ioData->mBuffers[iBuffer].mDataByteSize);
-        }
-        
-        if (!sm.playing)
-            return noErr;
-        if (!sm.outputBlock)
-            return noErr;
-        
-        
-        // Collect data to render from the callbacks
-        sm.outputBlock(sm.outData, inNumberFrames, sm.numOutputChannels);
-        
-        
-        // Put the rendered data into the output buffer
-        // TODO: convert SInt16 ranges to float ranges.
-        if ( sm.numBytesPerSample == 4 ) // then we've already got floats
-        {
-            
-            for (int iBuffer=0; iBuffer < ioData->mNumberBuffers; ++iBuffer) {
-                
-                int thisNumChannels = ioData->mBuffers[iBuffer].mNumberChannels;
-                
-                for (int iChannel = 0; iChannel < thisNumChannels; ++iChannel) {
-
-                    int interleaveOffset = iChannel;
-                    if (iBuffer < sm.numOutputChannels){
-                        interleaveOffset += iBuffer;
-                    }
-                    
-                    vDSP_vsadd(sm.outData+interleaveOffset, sm.numOutputChannels, &zero, (float *)ioData->mBuffers[iBuffer].mData, thisNumChannels, inNumberFrames);
-                    
-                }
-            }
-        }
-        else if ( sm.numBytesPerSample == 2 ) // then we need to convert SInt16 -> Float (and also scale)
-        {
-            float scale = (float)INT16_MAX;
-            vDSP_vsmul(sm.outData, 1, &scale, sm.outData, 1, inNumberFrames*sm.numOutputChannels);
-            
-            for (int iBuffer=0; iBuffer < ioData->mNumberBuffers; ++iBuffer) {
-                
-                int thisNumChannels = ioData->mBuffers[iBuffer].mNumberChannels;
-                
-                for (int iChannel = 0; iChannel < thisNumChannels; ++iChannel) {
-                    
-                    int interleaveOffset = iChannel;
-                    if (iBuffer < sm.numOutputChannels){
-                        interleaveOffset += iBuffer;
-                    }
-                    
-                    vDSP_vfix16(sm.outData+interleaveOffset, sm.numOutputChannels, (SInt16 *)ioData->mBuffers[iBuffer].mData+iChannel, thisNumChannels, inNumberFrames);
-                }
-            }
-            
-        }
-    }
-
-    return noErr;
-    
-}	
-
-#pragma mark - Audio Session Listeners
-#if defined (USING_IOS)
-void sessionPropertyListener(void *                  inClientData,
-							 AudioSessionPropertyID  inID,
-							 UInt32                  inDataSize,
-							 const void *            inData){
-	
-    // Determines the reason for the route change, to ensure that it is not
-    //      because of a category change.
-    CFNumberRef routeChangeReasonRef = (CFNumberRef)CFDictionaryGetValue ((CFDictionaryRef)inData, CFSTR (kAudioSession_AudioRouteChangeKey_Reason) );
-    SInt32 routeChangeReason;
-    CFNumberGetValue (routeChangeReasonRef, kCFNumberSInt32Type, &routeChangeReason);
-    
-    if (inID == kAudioSessionProperty_AudioRouteChange && routeChangeReason != kAudioSessionRouteChangeReason_CategoryChange)
-    {
-        Novocaine *sm = (__bridge Novocaine *)inClientData;
-        [sm checkSessionProperties];
-    }
-    
-}
-
-- (void)checkAudioSource {
-    // Check what the incoming audio route is.
-    UInt32 propertySize = sizeof(CFStringRef);
-    CFStringRef route;
-    CheckError( AudioSessionGetProperty(kAudioSessionProperty_AudioRoute, &propertySize, &route), "Couldn't check the audio route");
-    self.inputRoute = (__bridge NSString *)route;
-    CFRelease(route);
-    NSLog(@"AudioRoute: %@", self.inputRoute);
-    
-    
-    // Check if there's input available.
-    // TODO: check if checking for available input is redundant.
-    //          Possibly there's a different property ID change?
-    UInt32 isInputAvailable = 0;
-    UInt32 size = sizeof(isInputAvailable);
-    CheckError( AudioSessionGetProperty(kAudioSessionProperty_AudioInputAvailable, 
-                                        &size, 
-                                        &isInputAvailable), "Couldn't check if input is available");
-    self.inputAvailable = (BOOL)isInputAvailable;
-    NSLog(@"Input available? %d", self.inputAvailable);
-    
-}
-
-
-// To be run ONCE per session property change and once on initialization.
-- (void)checkSessionProperties
-{	
-    
-    // Check if there is input, and from where
-    [self checkAudioSource];
-    
-    // Check the number of input channels.
-    // Find the number of channels
-    UInt32 size = sizeof(self.numInputChannels);
-    UInt32 newNumChannels;
-    CheckError( AudioSessionGetProperty(kAudioSessionProperty_CurrentHardwareInputNumberChannels, &size, &newNumChannels), "Checking number of input channels");
-    self.numInputChannels = newNumChannels;
-    //    self.numInputChannels = 1;
-    NSLog(@"We've got %u input channels", (unsigned int)self.numInputChannels);
-    
-    
-    // Check the number of input channels.
-    // Find the number of channels
-    CheckError( AudioSessionGetProperty(kAudioSessionProperty_CurrentHardwareOutputNumberChannels, &size, &newNumChannels), "Checking number of output channels");
-    self.numOutputChannels = newNumChannels;
-    //    self.numOutputChannels = 1;
-    NSLog(@"We've got %u output channels", (unsigned int)self.numOutputChannels);
-    
-    
-    // Get the hardware sampling rate. This is settable, but here we're only reading.
-    Float64 currentSamplingRate;
-    size = sizeof(currentSamplingRate);
-    CheckError( AudioSessionGetProperty(kAudioSessionProperty_CurrentHardwareSampleRate, &size, &currentSamplingRate), "Checking hardware sampling rate");
-    self.samplingRate = currentSamplingRate;
-    NSLog(@"Current sampling rate: %f", self.samplingRate);
-	
-}
-
-void sessionInterruptionListener(void *inClientData, UInt32 inInterruption) {
-    
-	Novocaine *sm = (__bridge Novocaine *)inClientData;
-    
-	if (inInterruption == kAudioSessionBeginInterruption) {
-		NSLog(@"Begin interuption");
-		sm.inputAvailable = NO;
-	}
-	else if (inInterruption == kAudioSessionEndInterruption) {
-		NSLog(@"End interuption");	
-		sm.inputAvailable = YES;
-		[sm play];
-	}
-	
-}
-
-#endif
-
-
-
-
-#if defined ( USING_OSX )
-
-// Checks the number of channels and sampling rate of the connected device.
-- (void)checkDeviceProperties
-{
-    
-}
-
-- (void)selectAudioDevice:(AudioDeviceID)deviceID
-{
-    
-}
-
-#endif
-
-
-#pragma mark - Convenience Methods
-- (NSString *)applicationDocumentsDirectory {
-	return [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject];
-}
-
-
-@end
-
-
-
-
-
-
-
-
diff --git a/Novocaine/RingBuffer.h b/Novocaine/RingBuffer.h
deleted file mode 100644
index 150cdaa..0000000
--- a/Novocaine/RingBuffer.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-// TODO: Error throwing if things go wrong.
-#import <AudioToolbox/AudioToolbox.h>
-#import <Accelerate/Accelerate.h>
-
-#define kMaxNumChannels 4
-
-class RingBuffer {
-    
-public:	
-	RingBuffer() {};
-	RingBuffer(SInt64 bufferLength, SInt64 numChannels);
-	~RingBuffer();
-	
-	void AddNewSInt16AudioBuffer(const AudioBuffer aBuffer);
-	void AddNewSInt16Data(const SInt16 *newData, const SInt64 numFrames, const SInt64 whichChannel);
-	void AddNewFloatData(const float *newData, const SInt64 numFrames, const SInt64 whichChannel = 0);
-	void AddNewDoubleData(const double *newData, const SInt64 numFrames, const SInt64 whichChannel = 0);
-	void AddNewInterleavedFloatData(const float *newData, const SInt64 numFrames, const SInt64 numChannelsHere);
-    void FetchInterleavedData(float *outData, SInt64 numFrames, SInt64 numChannels);
-	void FetchFreshData(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride);
-	void FetchFreshData2(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride);
-    
-    void FetchData(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride);
-	SInt64 NumNewFrames(SInt64 lastReadFrame, int iChannel = 0);
-    SInt64 NumUnreadFrames(int iChannel = 0) {return mNumUnreadFrames[iChannel]; }
-	
-	SInt64 WriteHeadPosition(int aChannel = 0) { return mLastWrittenIndex[aChannel]; }
-	SInt64 ReadHeadPosition(int aChannel = 0) { return mLastReadIndex[aChannel]; }
-    
-    void SeekWriteHeadPosition(SInt64 offset, int iChannel=0);
-    void SeekReadHeadPosition(SInt64 offset, int iChannel=0);
-	SInt64 NumChannels() {return mNumChannels; }
-	
-	void Clear();
-	
-	// Analytics
-	float Mean(const SInt64 whichChannel = 0);
-	float Max(const SInt64 whichChannel = 0);
-	float Min(const SInt64 whichChannel = 0);
-	
-protected:
-	int64_t mLastWrittenIndex[kMaxNumChannels];
-	int64_t mLastReadIndex[kMaxNumChannels];
-    int64_t mNumUnreadFrames[kMaxNumChannels];
-	int64_t mSizeOfBuffer;
-	int64_t mNumChannels;
-	float **mData;
-	bool mAllocated;
-
-private:
-    void UpdateFrameCount(SInt64 numFrames, SInt64 channel);
-	
-};
\ No newline at end of file
diff --git a/Novocaine/RingBuffer.mm b/Novocaine/RingBuffer.mm
deleted file mode 100644
index f64d690..0000000
--- a/Novocaine/RingBuffer.mm
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright (c) 2012 Alex Wiltschko
-// 
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
-
-
-#include "RingBuffer.h"
-#import <libkern/OSAtomic.h>
-
-static void atomic_set(int64_t *ptr, int64_t value)
-{
-    OSAtomicAdd64(value - *ptr, ptr);
-}
-
-RingBuffer::RingBuffer(SInt64 bufferLength, SInt64 numChannels) : 
-mSizeOfBuffer(bufferLength)
-{
-	if (numChannels > kMaxNumChannels)
-		mNumChannels = kMaxNumChannels;
-	else if (numChannels <= 0)
-		mNumChannels = 1;
-	else
-		mNumChannels = numChannels;
-	
-	mData = (float **)calloc(numChannels, sizeof(float *));
-	for (int i=0; i < numChannels; ++i) {
-		mData[i] = (float *)calloc(bufferLength, sizeof(float));
-		mLastWrittenIndex[i] = 0;
-		mLastReadIndex[i] = 0;
-        mNumUnreadFrames[i] = 0;
-	}
-		
-}
-
-RingBuffer::~RingBuffer() 
-{
-    for (int i=0; i<mNumChannels; i++) {
-        free(mData[i]);
-    }
-}
-
-void RingBuffer::UpdateFrameCount(SInt64 numFrames, SInt64 channel)
-{
-    atomic_set(&mLastWrittenIndex[channel], (mLastWrittenIndex[channel] + numFrames) % (mSizeOfBuffer));
-    int64_t unreadFrames = mNumUnreadFrames[channel] + numFrames;
-    if (unreadFrames >= mSizeOfBuffer) unreadFrames = mSizeOfBuffer;
-    
-    atomic_set(&mNumUnreadFrames[channel], unreadFrames);
-}
-
-void RingBuffer::AddNewSInt16AudioBuffer(const AudioBuffer aBuffer)
-{
-		
-	int numChannelsHere = aBuffer.mNumberChannels;
-	int numFrames = aBuffer.mDataByteSize/(numChannelsHere*sizeof(SInt16));
-	SInt16 *newData = (SInt16 *)aBuffer.mData;
-	
-	SInt64 idx;
-		
-	for (int iChannel = 0; iChannel < mNumChannels; ++iChannel) {
-		for (int i=0; i < numFrames; ++i) {
-			idx = (i + mLastWrittenIndex[iChannel]) % (mSizeOfBuffer);
-			mData[iChannel][idx] = (float)newData[i*numChannelsHere + iChannel];
-		}
-        
-        UpdateFrameCount(numFrames, iChannel);
-	}
-	
-	
-}
-
-void RingBuffer::AddNewSInt16Data(const SInt16 *newData, const SInt64 numFrames, const SInt64 whichChannel)
-{
-	SInt64 idx;
-	for (int i=0; i < numFrames; ++i) {
-		idx = (i + mLastWrittenIndex[whichChannel]) % (mSizeOfBuffer);
-		mData[whichChannel][idx] = (float)newData[i];
-	}
-    
-    UpdateFrameCount(numFrames, whichChannel);
-}
-
-void RingBuffer::AddNewFloatData(const float *newData, const SInt64 numFrames, const SInt64 whichChannel)
-{
-	
-	SInt64 idx;
-	for (int i=0; i < numFrames; ++i) {
-		idx = (i + mLastWrittenIndex[whichChannel]) % (mSizeOfBuffer);
-		mData[whichChannel][idx] = newData[i];
-	}
-    
-    UpdateFrameCount(numFrames, whichChannel);
-}
-
-void RingBuffer::AddNewDoubleData(const double *newData, const SInt64 numFrames, const SInt64 whichChannel)
-{
-	
-	SInt64 idx;
-	for (int i=0; i < numFrames; ++i) {
-		idx = (i + mLastWrittenIndex[whichChannel]) % (mSizeOfBuffer);
-		mData[whichChannel][idx] = (float)newData[i];
-	}
-    UpdateFrameCount(numFrames, whichChannel);
-}
-
-void RingBuffer::AddNewInterleavedFloatData(const float *newData, const SInt64 numFrames, const SInt64 numChannelsHere)
-{
-	
-	SInt64 numChannelsToCopy = (numChannelsHere <= mNumChannels) ? numChannelsHere : mNumChannels;
-	float zero = 0.0f;
-	
-	for (int iChannel = 0; iChannel < numChannelsToCopy; ++iChannel) {
-		
-		if (numFrames + mLastWrittenIndex[iChannel] < mSizeOfBuffer) { // if our new set of samples won't overrun the edge of the buffer
-			vDSP_vsadd((float *)&newData[iChannel], 
-					   numChannelsHere, 
-					   &zero, 
-					   &mData[iChannel][mLastWrittenIndex[iChannel]],
-					   1, 
-					   numFrames);
-		} else {														// if we will overrun, then we need to do two separate copies.
-			SInt64 numSamplesInFirstCopy = mSizeOfBuffer - mLastWrittenIndex[iChannel];
-			SInt64 numSamplesInSecondCopy = numFrames - numSamplesInFirstCopy;
-            
-			vDSP_vsadd((float *)&newData[iChannel], 
-					   numChannelsHere, 
-					   &zero, 
-					   &mData[iChannel][mLastWrittenIndex[iChannel]],
-					   1, 
-					   numSamplesInFirstCopy);
-            
-			vDSP_vsadd((float *)&newData[numSamplesInFirstCopy*numChannelsHere + iChannel], 
-					   numChannelsHere, 
-					   &zero, 
-					   &mData[iChannel][0],
-					   1, 
-					   numSamplesInSecondCopy);
-		}
-        
-        UpdateFrameCount(numFrames, iChannel);
-	}
-	
-	
-}
-
-void RingBuffer::FetchFreshData2(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride)
-{
-
-    if (mLastWrittenIndex[whichChannel] - numFrames >= 0) { // if we're requesting samples that won't go off the left end of the ring buffer, then go ahead and copy them all out.
-        
-        UInt64 idx = mLastWrittenIndex[whichChannel] - numFrames;
-        float zero = 0.0f;
-        vDSP_vsadd(&mData[whichChannel][idx], 
-                   1, 
-                   &zero, 
-                   outData, 
-                   stride, 
-                   numFrames);
-    }
-    
-    else { // if we will overrun, then we need to do two separate copies.
-        
-        // The copy that bleeds off the left, and cycles back to the right of the ring buffer
-        int64_t numSamplesInFirstCopy = numFrames - mLastWrittenIndex[whichChannel];
-        // The copy that starts at the beginning, and proceeds to the end.
-        int64_t numSamplesInSecondCopy = mLastWrittenIndex[whichChannel];
-        
-        
-        float zero = 0.0f;
-        UInt64 firstIndex = mSizeOfBuffer - numSamplesInFirstCopy;
-        vDSP_vsadd(&mData[whichChannel][firstIndex],
-                   1, 
-                   &zero, 
-                   &outData[0], 
-                   stride, 
-                   numSamplesInFirstCopy);
-
-        vDSP_vsadd(&mData[whichChannel][0],
-                   1, 
-                   &zero, 
-                   &outData[numSamplesInFirstCopy*stride],
-                   stride, 
-                   numSamplesInSecondCopy);
-        
-    }
-
-}
-
-void RingBuffer::FetchData(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride)
-{
-    int64_t idx;
-	for (int i=0; i < numFrames; ++i) {
-		idx = (mLastReadIndex[whichChannel] + i) % (mSizeOfBuffer);
-		outData[i*stride] = mData[whichChannel][idx];
-	}
-	
-    atomic_set(&mLastReadIndex[whichChannel], (mLastReadIndex[whichChannel] + numFrames) % (mSizeOfBuffer));
-    
-    int64_t toAdd;
-    
-    if(mNumUnreadFrames[whichChannel] > numFrames)
-        toAdd = -numFrames;
-    else
-        toAdd = -mNumUnreadFrames[whichChannel];
-    
-    OSAtomicAdd64(toAdd, &mNumUnreadFrames[whichChannel]);
-
-}
-
-void RingBuffer::FetchInterleavedData(float *outData, SInt64 numFrames, SInt64 numChannels)
-{
-    for (int iChannel=0; iChannel < numChannels; ++iChannel) {
-        FetchData(&outData[iChannel], numFrames, iChannel, numChannels);
-    }
-
-}
-
-void RingBuffer::FetchFreshData(float *outData, SInt64 numFrames, SInt64 whichChannel, SInt64 stride)
-{
-
-	int64_t idx;
-	for (int i=0; i < numFrames; ++i) {
-		idx = (mLastWrittenIndex[whichChannel] - numFrames + i) % (mSizeOfBuffer);
-		outData[i*stride] = mData[whichChannel][idx];
-	}
-	
-	atomic_set(&mLastReadIndex[whichChannel], mLastWrittenIndex[whichChannel]);
-    // Reading at the front of the buffer resets old data
-    atomic_set(&mNumUnreadFrames[whichChannel], 0);
-}
-
-void RingBuffer::SeekWriteHeadPosition(SInt64 offset, int iChannel)
-{
-    atomic_set(&mLastWrittenIndex[iChannel], (mLastWrittenIndex[iChannel] + offset) % (mSizeOfBuffer));
-}
-
-void RingBuffer::SeekReadHeadPosition(SInt64 offset, int iChannel)
-{
-     atomic_set(&mLastReadIndex[iChannel], (mLastReadIndex[iChannel] + offset) % (mSizeOfBuffer));
-}
-
-
-SInt64 RingBuffer::NumNewFrames(SInt64 lastReadFrame, int iChannel)
-{
-	int64_t numNewFrames = mLastWrittenIndex[iChannel] - lastReadFrame;
-	if (numNewFrames < 0) numNewFrames += mSizeOfBuffer;
-	
-	return (SInt64)numNewFrames;
-}
-
-#pragma mark - Analytics
-float RingBuffer::Mean(const SInt64 whichChannel)
-{
-	float mean;
-	vDSP_meanv(mData[whichChannel],1,&mean,mSizeOfBuffer);
-	return mean;
-}
-
-
-float RingBuffer::Max(const SInt64 whichChannel)
-{
-	float max;
-	vDSP_maxv(mData[whichChannel],1,&max,mSizeOfBuffer);
-	return max;
-}
-
-
-float RingBuffer::Min(const SInt64 whichChannel)
-{
-	float min;
-	vDSP_minv(mData[whichChannel],1,&min,mSizeOfBuffer);
-	return min;	
-}
-
-
-void RingBuffer::Clear()
-{
-	for (int i=0; i < mNumChannels; ++i) {
-        atomic_set(&mLastWrittenIndex[i], 0);
-        atomic_set(&mLastReadIndex[i], 0);
-        atomic_set(&mNumUnreadFrames[i], 0);
-		memset(mData[i], 0, sizeof(float)*mSizeOfBuffer);
-	}
-	
-}
-
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/assets/acknowledgements.png b/assets/acknowledgements.png
new file mode 100644
index 0000000..3edf3f9
Binary files /dev/null and b/assets/acknowledgements.png differ
diff --git a/assets/cancellation.png b/assets/cancellation.png
new file mode 100644
index 0000000..828e23c
Binary files /dev/null and b/assets/cancellation.png differ
diff --git a/assets/colored.png b/assets/colored.png
new file mode 100644
index 0000000..498c540
Binary files /dev/null and b/assets/colored.png differ
diff --git a/assets/home.png b/assets/home.png
new file mode 100644
index 0000000..747d6c3
Binary files /dev/null and b/assets/home.png differ
diff --git a/assets/home_play.png b/assets/home_play.png
new file mode 100644
index 0000000..e12f574
Binary files /dev/null and b/assets/home_play.png differ
diff --git a/assets/nature.png b/assets/nature.png
new file mode 100644
index 0000000..ac1d204
Binary files /dev/null and b/assets/nature.png differ
diff --git a/assets/nature_play.png b/assets/nature_play.png
new file mode 100644
index 0000000..84d2511
Binary files /dev/null and b/assets/nature_play.png differ
diff --git a/design.txt b/design.txt
new file mode 100755
index 0000000..c378108
--- /dev/null
+++ b/design.txt
@@ -0,0 +1,14 @@
+Design
+We implemented our project in Xcode in Objective C. We created a single view application with a main view controller that has both header (“.h”) and implementation (“.m”) files. From this main view controller, there are five UIButtons: “Nature Noises”; “Colored Noises”; “Surprise Me!”; “Noise Cancellation”; and “Acknowledgements.” Every UIButton except “Surprise Me!” has its own view controller as well as its own .h and .m files. We will proceed to describe these four view controllers and then give a description of “Surprise Me!”
+
+
+Both “Colored Noises” and “Nature Noises” can be considered as parallel views. They contain a UIImage background, and have four or five UIButtons within them, respectively. Within their “.m” files, we wrote code to handle a press upon each of the buttons. When a button is pressed, the related sound starts playing. If the sound is already playing, the button is used to halt the playing of the sound. In the implementation, there is a check to see whether the sound handling object (of class AVAudioPlayer) exists—if not, it is created. We tried (for several hours) to factor out common code between these views by making another class that handled redundant code blocks, but we could not accomplish this. We did however manage to create new methods that would factor out some redundancies with each of the buttons and the creation of sound objects. If the user leaves the page, then the audio stops. However, the user may play multiple tracks from the same page at once.
+
+
+“Noise Cancellation” is a view that was meant for our original goal, ambient noise cancellation. In it, we describe what we hoped to accomplish with the app and the challenges we faced. More specifically, we note that we were able to create code that could process ambient noise, but not in a manner that would cancel out that noise. We hope in the future that this noise cancellation page will have a successful noise cancelling function.
+
+
+“Surprise Me!” is the only UIButton that has code in the main view controller implementation file. When the button is pressed, an event handler in the main view controller “.m” file is triggered that checks whether audio is already running. If not, then it generates a pseudorandom number which corresponds with one of our noise tracks, and plays the track. If audio is already running, then it stops the track and deletes the sound object. Additionally, we wrote code that will stop the audio and delete the noise object if the user leaves the home page.
+
+
+Although we did not accomplish our initial goal of ambient noise cancellation, we had fun exploring alternative ideas and making this application. We are proud of the work and hope you enjoy playing with it.
diff --git a/documentation.txt b/documentation.txt
new file mode 100755
index 0000000..445a3e4
--- /dev/null
+++ b/documentation.txt
@@ -0,0 +1,25 @@
+Documentation
+
+1. Download the project folder onto a macOS system.
+2. Open “Noise Manipulation.xcodeproj”
+3. In the top left corner, set the iPhone version to “5s.”
+4. Hit the play (▶) button in the top left corner.
+5. The iPhone simulator might take some time to load, but it will appear once it is ready.
+6. Enjoy our app!
+
+In the app:
+The opening screen has 5 buttons: Nature Noises, Color Noises, Surprise Me!, Noise Cancellation, and Acknowledgements.
+Nature Noises navigates to a screen with five tracks:
+1. Rain
+2. Wind
+3. Space
+4. Ocean
+5. Thunder
+Color Noises navigates to a screen with four tracks:
+1. White
+2. Pink
+3. Red
+4. Grey
+Surprise Me! plays one of these sounds, selecting pseudo-randomly.
+Noise Cancellation contains information about our initial project plans, and what we hope to accomplish in the future.
+Acknowledgements contains credits for audio tracks and visuals.
\ No newline at end of file
diff --git a/noise_manipulation-master/README.md b/noise_manipulation-master/README.md
deleted file mode 100755
index 67de2b5..0000000
--- a/noise_manipulation-master/README.md
+++ /dev/null
@@ -1 +0,0 @@
-# noise_manipulation
diff --git a/something.txt b/something.txt
deleted file mode 100644
index 8a49039..0000000
--- a/something.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-echo "# noise_manipulation" >> README.md
-git init
-git add README.md
-git commit -m "first commit"
-git remote add origin https://github.com/zachdietz1/noise_manipulation.git
-git push -u origin master
-
-changed the repo to: https://github.com/Jacqquot/cs50_project.git
\ No newline at end of file