diff --git a/STK for iOS/STK for iOS.xcodeproj/project.pbxproj b/STK for iOS/STK for iOS.xcodeproj/project.pbxproj
index 74cd8fd..d8f69b4 100644
--- a/STK for iOS/STK for iOS.xcodeproj/project.pbxproj	
+++ b/STK for iOS/STK for iOS.xcodeproj/project.pbxproj	
@@ -6,7 +6,24 @@
 	objectVersion = 46;
 	objects = {
 
+/* Begin PBXBuildFile section */
+		B05F5A9718BC12F8008EE790 /* Stk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B08F618118BA9B1800C14A90 /* Stk.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		B05F5A5718BC1018008EE790 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = "include/$(PRODUCT_NAME)";
+			dstSubfolderSpec = 6;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
 /* Begin PBXFileReference section */
+		B05F5A5918BC1018008EE790 /* libSTK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libSTK.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		B08F608F18BA9B1800C14A90 /* ADSR.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ADSR.h; path = ../include/ADSR.h; sourceTree = "<group>"; };
 		B08F609018BA9B1800C14A90 /* Asymp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Asymp.h; path = ../include/Asymp.h; sourceTree = "<group>"; };
 		B08F609118BA9B1800C14A90 /* BandedWG.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BandedWG.h; sourceTree = "<group>"; };
@@ -178,8 +195,8 @@
 		B08F615B18BA9B1800C14A90 /* LentPitShift.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = LentPitShift.cpp; sourceTree = "<group>"; };
 		B08F615D18BA9B1800C14A90 /* Mandolin.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Mandolin.cpp; path = ../src/Mandolin.cpp; sourceTree = "<group>"; };
 		B08F615E18BA9B1800C14A90 /* Mesh2D.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Mesh2D.cpp; path = ../src/Mesh2D.cpp; sourceTree = "<group>"; };
-		B08F615F18BA9B1800C14A90 /* Messager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Messager.cpp; sourceTree = "<group>"; };
-		B08F616018BA9B1800C14A90 /* MidiFileIn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = MidiFileIn.cpp; sourceTree = "<group>"; };
+		B08F615F18BA9B1800C14A90 /* Messager.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Messager.cpp; path = ../src/Messager.cpp; sourceTree = "<group>"; };
+		B08F616018BA9B1800C14A90 /* MidiFileIn.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = MidiFileIn.cpp; path = ../src/MidiFileIn.cpp; sourceTree = "<group>"; };
 		B08F616118BA9B1800C14A90 /* Modal.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Modal.cpp; sourceTree = "<group>"; };
 		B08F616218BA9B1800C14A90 /* ModalBar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = ModalBar.cpp; path = ../src/ModalBar.cpp; sourceTree = "<group>"; };
 		B08F616318BA9B1800C14A90 /* Modulate.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Modulate.cpp; sourceTree = "<group>"; };
@@ -189,7 +206,7 @@
 		B08F616818BA9B1800C14A90 /* OnePole.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = OnePole.cpp; sourceTree = "<group>"; };
 		B08F616918BA9B1800C14A90 /* OneZero.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = OneZero.cpp; sourceTree = "<group>"; };
 		B08F616A18BA9B1800C14A90 /* PercFlut.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = PercFlut.cpp; path = ../src/PercFlut.cpp; sourceTree = "<group>"; };
-		B08F616B18BA9B1800C14A90 /* Phonemes.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Phonemes.cpp; sourceTree = "<group>"; };
+		B08F616B18BA9B1800C14A90 /* Phonemes.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Phonemes.cpp; path = ../src/Phonemes.cpp; sourceTree = "<group>"; };
 		B08F616C18BA9B1800C14A90 /* PitShift.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PitShift.cpp; sourceTree = "<group>"; };
 		B08F616D18BA9B1800C14A90 /* Plucked.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Plucked.cpp; path = ../src/Plucked.cpp; sourceTree = "<group>"; };
 		B08F616E18BA9B1800C14A90 /* PoleZero.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = PoleZero.cpp; sourceTree = "<group>"; };
@@ -201,10 +218,10 @@
 		B08F617818BA9B1800C14A90 /* Shakers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Shakers.cpp; path = ../src/Shakers.cpp; sourceTree = "<group>"; };
 		B08F617918BA9B1800C14A90 /* Simple.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Simple.cpp; path = ../src/Simple.cpp; sourceTree = "<group>"; };
 		B08F617A18BA9B1800C14A90 /* SineWave.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SineWave.cpp; sourceTree = "<group>"; };
-		B08F617B18BA9B1800C14A90 /* SingWave.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = SingWave.cpp; sourceTree = "<group>"; };
+		B08F617B18BA9B1800C14A90 /* SingWave.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = SingWave.cpp; path = ../src/SingWave.cpp; sourceTree = "<group>"; };
 		B08F617C18BA9B1800C14A90 /* Sitar.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Sitar.cpp; path = ../src/Sitar.cpp; sourceTree = "<group>"; };
 		B08F617D18BA9B1800C14A90 /* Skini.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Skini.cpp; sourceTree = "<group>"; };
-		B08F617F18BA9B1800C14A90 /* Sphere.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Sphere.cpp; sourceTree = "<group>"; };
+		B08F617F18BA9B1800C14A90 /* Sphere.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Sphere.cpp; path = ../src/Sphere.cpp; sourceTree = "<group>"; };
 		B08F618018BA9B1800C14A90 /* StifKarp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = StifKarp.cpp; path = ../src/StifKarp.cpp; sourceTree = "<group>"; };
 		B08F618118BA9B1800C14A90 /* Stk.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Stk.cpp; sourceTree = "<group>"; };
 		B08F618218BA9B1800C14A90 /* TapDelay.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TapDelay.cpp; sourceTree = "<group>"; };
@@ -212,13 +229,48 @@
 		B08F618718BA9B1900C14A90 /* Twang.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Twang.cpp; path = ../src/Twang.cpp; sourceTree = "<group>"; };
 		B08F618818BA9B1900C14A90 /* TwoPole.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TwoPole.cpp; sourceTree = "<group>"; };
 		B08F618918BA9B1900C14A90 /* TwoZero.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = TwoZero.cpp; sourceTree = "<group>"; };
-		B08F618B18BA9B1900C14A90 /* Voicer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Voicer.cpp; sourceTree = "<group>"; };
+		B08F618B18BA9B1900C14A90 /* Voicer.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Voicer.cpp; path = ../src/Voicer.cpp; sourceTree = "<group>"; };
 		B08F618C18BA9B1900C14A90 /* VoicForm.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = VoicForm.cpp; path = ../src/VoicForm.cpp; sourceTree = "<group>"; };
 		B08F618D18BA9B1900C14A90 /* Whistle.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Whistle.cpp; path = ../src/Whistle.cpp; sourceTree = "<group>"; };
 		B08F618E18BA9B1900C14A90 /* Wurley.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Wurley.cpp; path = ../src/Wurley.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
+/* Begin PBXFrameworksBuildPhase section */
+		B05F5A5618BC1018008EE790 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
 /* Begin PBXGroup section */
+		B05F5A5A18BC1018008EE790 /* Helpers */ = {
+			isa = PBXGroup;
+			children = (
+				B08F619718BC06A300C14A90 /* Base */,
+				B08F60C018BA9B1800C14A90 /* Messager.h */,
+				B08F615F18BA9B1800C14A90 /* Messager.cpp */,
+				B08F60C118BA9B1800C14A90 /* MidiFileIn.h */,
+				B08F616018BA9B1800C14A90 /* MidiFileIn.cpp */,
+				B08F60CC18BA9B1800C14A90 /* Phonemes.h */,
+				B08F616B18BA9B1800C14A90 /* Phonemes.cpp */,
+				B08F60DE18BA9B1800C14A90 /* SingWave.h */,
+				B08F617B18BA9B1800C14A90 /* SingWave.cpp */,
+				B08F60E418BA9B1800C14A90 /* Sphere.h */,
+				B08F617F18BA9B1800C14A90 /* Sphere.cpp */,
+				B08F60F118BA9B1800C14A90 /* Voicer.h */,
+				B08F618B18BA9B1900C14A90 /* Voicer.cpp */,
+				E81E86DB18BBDAA800289223 /* File I/O */,
+				E81E86D918BBD9D000289223 /* Maths */,
+				E81E86DD18BBDBC900289223 /* SKINI */,
+				B08F60F718BA9B1800C14A90 /* rawwaves */,
+				B05F5A5918BC1018008EE790 /* libSTK.a */,
+			);
+			name = Helpers;
+			sourceTree = "<group>";
+		};
 		B08F608718BA9B0600C14A90 = {
 			isa = PBXGroup;
 			children = (
@@ -226,7 +278,7 @@
 				B08F608E18BA9B1800C14A90 /* Instruments */,
 				E81E86DA18BBDA1200289223 /* Effects */,
 				E81E86D818BBD93600289223 /* Filters */,
-				E81E86DC18BBDB9C00289223 /* Helpers */,
+				B05F5A5A18BC1018008EE790 /* Helpers */,
 			);
 			sourceTree = "<group>";
 		};
@@ -392,6 +444,7 @@
 				B08F616118BA9B1800C14A90 /* Modal.cpp */,
 			);
 			name = Base;
+			path = ../src;
 			sourceTree = "<group>";
 		};
 		E81E86D818BBD93600289223 /* Filters */ = {
@@ -431,6 +484,7 @@
 				B08F60F018BA9B1800C14A90 /* Vector3D.h */,
 			);
 			name = Maths;
+			path = ../src;
 			sourceTree = "<group>";
 		};
 		E81E86DA18BBDA1200289223 /* Effects */ = {
@@ -482,30 +536,6 @@
 				B08F60AA18BA9B1800C14A90 /* FileWvOut.h */,
 			);
 			name = "File I/O";
-			sourceTree = "<group>";
-		};
-		E81E86DC18BBDB9C00289223 /* Helpers */ = {
-			isa = PBXGroup;
-			children = (
-				B08F619718BC06A300C14A90 /* Base */,
-				B08F60C018BA9B1800C14A90 /* Messager.h */,
-				B08F615F18BA9B1800C14A90 /* Messager.cpp */,
-				B08F60C118BA9B1800C14A90 /* MidiFileIn.h */,
-				B08F616018BA9B1800C14A90 /* MidiFileIn.cpp */,
-				B08F60CC18BA9B1800C14A90 /* Phonemes.h */,
-				B08F616B18BA9B1800C14A90 /* Phonemes.cpp */,
-				B08F60DE18BA9B1800C14A90 /* SingWave.h */,
-				B08F617B18BA9B1800C14A90 /* SingWave.cpp */,
-				B08F60E418BA9B1800C14A90 /* Sphere.h */,
-				B08F617F18BA9B1800C14A90 /* Sphere.cpp */,
-				B08F60F118BA9B1800C14A90 /* Voicer.h */,
-				B08F618B18BA9B1900C14A90 /* Voicer.cpp */,
-				E81E86DB18BBDAA800289223 /* File I/O */,
-				E81E86D918BBD9D000289223 /* Maths */,
-				E81E86DD18BBDBC900289223 /* SKINI */,
-				B08F60F718BA9B1800C14A90 /* rawwaves */,
-			);
-			name = Helpers;
 			path = ../src;
 			sourceTree = "<group>";
 		};
@@ -518,10 +548,31 @@
 				B08F60E218BA9B1800C14A90 /* SKINI.tbl */,
 			);
 			name = SKINI;
+			path = ../src;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
+/* Begin PBXNativeTarget section */
+		B05F5A5818BC1018008EE790 /* STK */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = B05F5A7E18BC1018008EE790 /* Build configuration list for PBXNativeTarget "STK" */;
+			buildPhases = (
+				B05F5A5518BC1018008EE790 /* Sources */,
+				B05F5A5618BC1018008EE790 /* Frameworks */,
+				B05F5A5718BC1018008EE790 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = STK;
+			productName = STK;
+			productReference = B05F5A5918BC1018008EE790 /* libSTK.a */;
+			productType = "com.apple.product-type.library.static";
+		};
+/* End PBXNativeTarget section */
+
 /* Begin PBXProject section */
 		B08F608818BA9B0600C14A90 /* Project object */ = {
 			isa = PBXProject;
@@ -536,14 +587,119 @@
 				en,
 			);
 			mainGroup = B08F608718BA9B0600C14A90;
+			productRefGroup = B05F5A5A18BC1018008EE790 /* Helpers */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
+				B05F5A5818BC1018008EE790 /* STK */,
 			);
 		};
 /* End PBXProject section */
 
+/* Begin PBXSourcesBuildPhase section */
+		B05F5A5518BC1018008EE790 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				B05F5A9718BC12F8008EE790 /* Stk.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
 /* Begin XCBuildConfiguration section */
+		B05F5A7A18BC1018008EE790 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DSTROOT = /tmp/STK.dst;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "";
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../include/,
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+			};
+			name = Debug;
+		};
+		B05F5A7B18BC1018008EE790 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = YES;
+				DSTROOT = /tmp/STK.dst;
+				ENABLE_NS_ASSERTIONS = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "";
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = (
+					../include/,
+					"$(inherited)",
+					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
+				);
+				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
+				OTHER_LDFLAGS = "-ObjC";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
 		B08F608C18BA9B0600C14A90 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -559,6 +715,15 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
+		B05F5A7E18BC1018008EE790 /* Build configuration list for PBXNativeTarget "STK" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				B05F5A7A18BC1018008EE790 /* Debug */,
+				B05F5A7B18BC1018008EE790 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		B08F608B18BA9B0600C14A90 /* Build configuration list for PBXProject "STK for iOS" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (