60 files changed, 70 insertions, 9 deletions

diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/atomSynthesis.xcodeproj/project.pbxproj b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/atomSynthesis.xcodeproj/project.pbxproj
index 7fb094d..0a6ee57 100644
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/atomSynthesis.xcodeproj/project.pbxproj
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/atomSynthesis.xcodeproj/project.pbxproj
@@ -17,6 +17,10 @@
 		8320A5311462EF5100D1BD32 /* ofxOscSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8320A52A1462EF5100D1BD32 /* ofxOscSender.cpp */; };
 		8320A65914630D3F00D1BD32 /* maxiAtoms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8320A65714630D3F00D1BD32 /* maxiAtoms.cpp */; };
 		8320A66B14630D8B00D1BD32 /* btAlignedAllocator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8320A66614630D8B00D1BD32 /* btAlignedAllocator.cpp */; };
+		8320A9691469813200D1BD32 /* tinyxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8320A9621469813200D1BD32 /* tinyxml.cpp */; };
+		8320A96A1469813200D1BD32 /* tinyxmlerror.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8320A9641469813200D1BD32 /* tinyxmlerror.cpp */; };
+		8320A96B1469813200D1BD32 /* tinyxmlparser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8320A9651469813200D1BD32 /* tinyxmlparser.cpp */; };
+		8320A96C1469813200D1BD32 /* ofxXmlSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8320A9671469813200D1BD32 /* ofxXmlSettings.cpp */; };
 		8354488F140CFBC900D16314 /* fft.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83544883140CFBC900D16314 /* fft.cpp */; };
 		83544890140CFBC900D16314 /* maxiFFT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83544885140CFBC900D16314 /* maxiFFT.cpp */; };
 		83544891140CFBC900D16314 /* maxiGrains.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 83544887140CFBC900D16314 /* maxiGrains.cpp */; };
@@ -108,6 +112,13 @@
 		8320A66814630D8B00D1BD32 /* btAlignedObjectArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = btAlignedObjectArray.h; sourceTree = "<group>"; };
 		8320A66914630D8B00D1BD32 /* btScalar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = btScalar.h; sourceTree = "<group>"; };
 		8320A66A14630D8B00D1BD32 /* someTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = someTypes.h; sourceTree = "<group>"; };
+		8320A9601469813200D1BD32 /* install.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = install.xml; sourceTree = "<group>"; };
+		8320A9621469813200D1BD32 /* tinyxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxml.cpp; sourceTree = "<group>"; };
+		8320A9631469813200D1BD32 /* tinyxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinyxml.h; sourceTree = "<group>"; };
+		8320A9641469813200D1BD32 /* tinyxmlerror.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlerror.cpp; sourceTree = "<group>"; };
+		8320A9651469813200D1BD32 /* tinyxmlparser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxmlparser.cpp; sourceTree = "<group>"; };
+		8320A9671469813200D1BD32 /* ofxXmlSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ofxXmlSettings.cpp; sourceTree = "<group>"; };
+		8320A9681469813200D1BD32 /* ofxXmlSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ofxXmlSettings.h; sourceTree = "<group>"; };
 		83544881140CFBC900D16314 /* install.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = install.xml; sourceTree = "<group>"; };
 		83544883140CFBC900D16314 /* fft.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = fft.cpp; sourceTree = "<group>"; };
 		83544884140CFBC900D16314 /* fft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fft.h; sourceTree = "<group>"; };
@@ -296,6 +307,37 @@
 			path = ../../../../../src/Maximilian/ofxMaxim/ofxMaxim/libs/storage;
 			sourceTree = SOURCE_ROOT;
 		};
+		8320A95F1469813200D1BD32 /* ofxXmlSettings */ = {
+			isa = PBXGroup;
+			children = (
+				8320A9601469813200D1BD32 /* install.xml */,
+				8320A9611469813200D1BD32 /* libs */,
+				8320A9661469813200D1BD32 /* src */,
+			);
+			name = ofxXmlSettings;
+			path = ../../../addons/ofxXmlSettings;
+			sourceTree = SOURCE_ROOT;
+		};
+		8320A9611469813200D1BD32 /* libs */ = {
+			isa = PBXGroup;
+			children = (
+				8320A9621469813200D1BD32 /* tinyxml.cpp */,
+				8320A9631469813200D1BD32 /* tinyxml.h */,
+				8320A9641469813200D1BD32 /* tinyxmlerror.cpp */,
+				8320A9651469813200D1BD32 /* tinyxmlparser.cpp */,
+			);
+			path = libs;
+			sourceTree = "<group>";
+		};
+		8320A9661469813200D1BD32 /* src */ = {
+			isa = PBXGroup;
+			children = (
+				8320A9671469813200D1BD32 /* ofxXmlSettings.cpp */,
+				8320A9681469813200D1BD32 /* ofxXmlSettings.h */,
+			);
+			path = src;
+			sourceTree = "<group>";
+		};
 		83544880140CFBC900D16314 /* ofxMaxim */ = {
 			isa = PBXGroup;
 			children = (
@@ -338,6 +380,7 @@
 		BB4B014C10F69532006C3DED /* addons */ = {
 			isa = PBXGroup;
 			children = (
+				8320A95F1469813200D1BD32 /* ofxXmlSettings */,
 				8320A5081462EF5000D1BD32 /* ofxOsc */,
 				83544880140CFBC900D16314 /* ofxMaxim */,
 			);
@@ -519,6 +562,10 @@
 				8320A5311462EF5100D1BD32 /* ofxOscSender.cpp in Sources */,
 				8320A65914630D3F00D1BD32 /* maxiAtoms.cpp in Sources */,
 				8320A66B14630D8B00D1BD32 /* btAlignedAllocator.cpp in Sources */,
+				8320A9691469813200D1BD32 /* tinyxml.cpp in Sources */,
+				8320A96A1469813200D1BD32 /* tinyxmlerror.cpp in Sources */,
+				8320A96B1469813200D1BD32 /* tinyxmlparser.cpp in Sources */,
+				8320A96C1469813200D1BD32 /* ofxXmlSettings.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/GLUT b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/GLUT
index c578310..c578310 120000
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/GLUT
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/GLUT
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Headers b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Headers
index a177d2a..a177d2a 120000
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Headers
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Headers
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Resources b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Resources
index 953ee36..953ee36 120000
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Resources
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Resources
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/GLUT b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/GLUT
index 2be5e34..2be5e34 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/GLUT
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/GLUT
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/copy.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/copy.h
index a5116e2..a5116e2 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/copy.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/copy.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/extrude.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/extrude.h
index 658699e..658699e 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/extrude.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/extrude.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glsmap.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glsmap.h
index baf54a7..baf54a7 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glsmap.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glsmap.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glsmapint.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glsmapint.h
index 3620e7d..3620e7d 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glsmapint.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glsmapint.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glut.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glut.h
index cbc6ebe..cbc6ebe 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glut.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glut.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutbitmap.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutbitmap.h
index e29a016..e29a016 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutbitmap.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutbitmap.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutf90.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutf90.h
index f8a170b..f8a170b 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutf90.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutf90.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutstroke.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutstroke.h
index cbc9e15..cbc9e15 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutstroke.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/glutstroke.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/gutil.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/gutil.h
index f7ffcf3..f7ffcf3 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/gutil.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/gutil.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/intersect.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/intersect.h
index f5ff7a5..f5ff7a5 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/intersect.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/intersect.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/port.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/port.h
index 2827bbf..2827bbf 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/port.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/port.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/rot.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/rot.h
index 91083e9..91083e9 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/rot.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/rot.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/segment.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/segment.h
index 8d1cf04..8d1cf04 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/segment.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/segment.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/tube.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/tube.h
index c303e19..c303e19 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/tube.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/tube.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/tube_gc.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/tube_gc.h
index ccd2853..ccd2853 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/tube_gc.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/tube_gc.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/vvector.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/vvector.h
index b58dcd6..b58dcd6 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/vvector.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Headers/vvector.h
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/Caution.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/Caution.tiff
index ec49652..ec49652 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/Caution.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/Caution.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/classes.nib b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/classes.nib
index 04b22df..04b22df 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/classes.nib
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/classes.nib
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/info.nib b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/info.nib
index d5cf056..d5cf056 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/info.nib
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/info.nib
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/objects.nib b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/objects.nib
index 8a7140e..8a7140e 100644
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/objects.nib
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUT.nib/objects.nib
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/classes.nib b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/classes.nib
index 7e85eb1..7e85eb1 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/classes.nib
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/classes.nib
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/info.nib b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/info.nib
index 867735d..867735d 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/info.nib
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/info.nib
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/objects.nib b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/objects.nib
index 29125d4..29125d4 100644
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/objects.nib
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/objects.nib
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/classes.nib b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/classes.nib
index c675963..c675963 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/classes.nib
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/classes.nib
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/info.nib b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/info.nib
index 216c8dc..216c8dc 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/info.nib
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/info.nib
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/objects.nib b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/objects.nib
index 7598f2c..7598f2c 100644
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/objects.nib
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/objects.nib
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTUI.strings b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTUI.strings
index 6db3c5c..6db3c5c 100644
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTUI.strings
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/GLUTUI.strings
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/InfoPlist.strings b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
index 6f78b89..6f78b89 100644
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/Info.plist b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/Info.plist
index e8fc9d6..e8fc9d6 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/Info.plist
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/Info.plist
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/blankCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/blankCursor.tiff
index a2b0cf1..a2b0cf1 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/blankCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/blankCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomCursor.tiff
index c3f4795..c3f4795 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomleftCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomleftCursor.tiff
index 274529f..274529f 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomleftCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomleftCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomrightCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomrightCursor.tiff
index dec4252..dec4252 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomrightCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/bottomrightCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/crossCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/crossCursor.tiff
index 8536c0e..8536c0e 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/crossCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/crossCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/cycleCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/cycleCursor.tiff
index 34b52f6..34b52f6 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/cycleCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/cycleCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/destroyCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/destroyCursor.tiff
index 9e3a1cb..9e3a1cb 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/destroyCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/destroyCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/fingerCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/fingerCursor.tiff
index 0087c66..0087c66 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/fingerCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/fingerCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/helpCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/helpCursor.tiff
index fc4a88a..fc4a88a 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/helpCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/helpCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/leftCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/leftCursor.tiff
index 852b69b..852b69b 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/leftCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/leftCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/leftRightCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/leftRightCursor.tiff
index 37fe393..37fe393 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/leftRightCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/leftRightCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/rightArrowCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/rightArrowCursor.tiff
index d852616..d852616 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/rightArrowCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/rightArrowCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/rightCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/rightCursor.tiff
index 9781f22..9781f22 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/rightCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/rightCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/sprayCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/sprayCursor.tiff
index 9bec966..9bec966 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/sprayCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/sprayCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/topCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/topCursor.tiff
index e4df0de..e4df0de 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/topCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/topCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/topleftCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/topleftCursor.tiff
index 43cf97f..43cf97f 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/topleftCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/topleftCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/toprightCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/toprightCursor.tiff
index 429b01b..429b01b 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/toprightCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/toprightCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/upDownCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/upDownCursor.tiff
index 1605063..1605063 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/upDownCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/upDownCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/waitCursor.tiff b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/waitCursor.tiff
index 81ba1aa..81ba1aa 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/waitCursor.tiff
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/A/Resources/waitCursor.tiff
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/Current b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/Current
index 8c7e5a6..8c7e5a6 120000
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Frameworks/GLUT.framework/Versions/Current
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Frameworks/GLUT.framework/Versions/Current
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Info.plist b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Info.plist
index dd20398..47d824f 100644
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/Info.plist
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/Info.plist
@@ -7,7 +7,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>atomSynthesisDebug</string>
+	<string>mpDebug</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.yourcompany.openFrameworks</string>
 	<key>CFBundleInfoDictionaryVersion</key>
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/MacOS/libfmodex.dylib b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/MacOS/libfmodex.dylib
index bea90a1..bea90a1 100644
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/MacOS/libfmodex.dylib
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/MacOS/libfmodex.dylib
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/MacOS/atomSynthesisDebug b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/MacOS/mpDebug
index 923bed2..1f3c940 100755
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/MacOS/atomSynthesisDebug
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/MacOS/mpDebug
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/PkgInfo b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/PkgInfo
index bd04210..bd04210 100644
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/atomSynthesisDebug.app/Contents/PkgInfo
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/bin/mpDebug.app/Contents/PkgInfo
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.cpp b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.cpp
index b8e5ffd..1164aba 100644
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.cpp
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.cpp
@@ -1,5 +1,6 @@
 #include "mp.h"
 
+
 //--------------------------------------------------------------
 void mp::setup(){
 	ofEnableAlphaBlending();
@@ -11,22 +12,34 @@ void mp::setup(){
 	
 	
 	atomBuffer.resize(512);
-
+	
+	maxiAtomBook::loadMPTKXmlBook(ofToDataPath("/tmp/book.xml"), book);
+	sort(book.atoms.begin(), book.atoms.end(), maxiAtom::atomSortPositionAsc);
 
 	ofxMaxiSettings::setup(44100, 2, 512);
 	ofSoundStreamSetup(maxiSettings::channels,0,this, maxiSettings::sampleRate, maxiSettings::bufferSize, 4);/* Call this last ! */
 	
 }
 
+
+
 //--------------------------------------------------------------
 void mp::update(){
 	flArr test;
-	maxiAtoms::createGabor(test, maxiMap::linexp((float)mouseX/ofGetWidth(), 0, 1, 100, 10000) * (1.0 + (ofRandomuf() * 0.2)), 
-					   maxiSettings::sampleRate, 
-					   maxiMap::linlin((float)mouseY / ofGetHeight(), 0, 1, 2000, 40000) * (1.0 + (ofRandomuf() * 0.3)), 
-					   ofRandomf() * PI, 0.3, 0.05);
-	atStream.addAtom(test);
+//	maxiCollider::createGabor(test, maxiMap::linexp((float)mouseX/ofGetWidth(), 0, 1, 100, 10000) * (1.0 + (ofRandomuf() * 0.2)), 
+//					   maxiSettings::sampleRate, 
+//					   maxiMap::linlin((float)mouseY / ofGetHeight(), 0, 1, 2000, 40000) * (1.0 + (ofRandomuf() * 0.3)), 
+//					   ofRandomf() * PI, 0.3, 0.05);
+//	atomStream.addAtom(test);
+	static int atomIdx=0;
+//	static void createGabor(flArr &atom, const float freq, const float sampleRate, const uint length, 
+//							const float phase, const float kurtotis, const float amp);
+	maxiGaborAtom *atom = (maxiGaborAtom*) book.atoms[atomIdx % book.atoms.size()];
+	cout << atom->frequency << endl;
+	maxiCollider::createGabor(test, maxiMap::linexp(atom->frequency, 0, 0.2, 20, 20000), 44100, atom->length, atom->phase, 0.3, atom->amp / 40.0);
+	atomStream.addAtom(test);
 	
+	atomIdx++;
 }
 
 //--------------------------------------------------------------
@@ -36,7 +49,7 @@ void mp::draw(){
 
 void mp::audioRequested 	(float * output, int bufferSize, int nChannels){
 	memset(&atomBuffer[0], 0, sizeof(float) * bufferSize);
-	atStream.fillNextBuffer(&(atomBuffer[0]), bufferSize);
+	atomStream.fillNextBuffer(&(atomBuffer[0]), bufferSize);
 	for (int i = 0; i < bufferSize; i++){
 		output[i*nChannels    ] = output[i*nChannels + 1] = atomBuffer[i]; 
 	}
diff --git a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.h b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.h
index 00d185e..5a3021d 100644
--- a/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.h
+++ b/ofxMaxim/ofxMaximExamples007OSX/maxiAtomSynthesis/src/mp.h
@@ -25,7 +25,8 @@ class mp : public ofBaseApp{
 		void audioRequested 	(float * input, int bufferSize, int nChannels); /* output method */
 
 //	pyOSCDebug pyd;
-	maxiAtomStream atStream;
+	maxiAccelerator atomStream;
+	maxiAtomBook book;
 	
 	flArr atomBuffer;