diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..62b06b5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,156 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+
+[Dd]ebug/
+[Rr]elease/
+x64/
+build/
+[Bb]in/
+[Oo]bj/
+
+# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
+!packages/*/build/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.log
+*.scc
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+
+#LightSwitch generated files
+GeneratedArtifacts/
+_Pvt_Extensions/
+ModelManifest.xml
+
+# =========================
+# Windows detritus
+# =========================
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac desktop service store files
+.DS_Store
diff --git a/VrpnNet/AnalogServer.cpp b/VrpnNet/AnalogServer.cpp
index 8b6b741..8328640 100644
--- a/VrpnNet/AnalogServer.cpp
+++ b/VrpnNet/AnalogServer.cpp
@@ -171,8 +171,4 @@ AnalogServer::AnalogChannelCollection ^AnalogServer::AnalogChannels::get()
 {
 	CHECK_DISPOSAL_STATUS();
 	return m_channels;
-}
-cli::array<AnalogServerChannel ^> ^AnalogServer::Channels::get()
-{
-	return m_channels;
 }
\ No newline at end of file
diff --git a/VrpnNet/AnalogServer.h b/VrpnNet/AnalogServer.h
index 014de18..47c6979 100644
--- a/VrpnNet/AnalogServer.h
+++ b/VrpnNet/AnalogServer.h
@@ -45,10 +45,10 @@ namespace Vrpn {
 			virtual System::Boolean get();
 		}
 
-		property cli::array<AnalogServerChannel ^> ^Channels
-		{
-			cli::array<AnalogServerChannel ^> ^get();
-		}
+		//property cli::array<AnalogServerChannel ^> ^Channels
+		//{
+		//	cli::array<AnalogServerChannel ^> ^get();
+		//}
 
 		void Report();
 		void Report(ServiceClass classOfService, System::DateTime time);
diff --git a/VrpnNet/VrpnNet.vcxproj b/VrpnNet/VrpnNet.vcxproj
index 1e117e1..0838679 100644
--- a/VrpnNet/VrpnNet.vcxproj
+++ b/VrpnNet/VrpnNet.vcxproj
@@ -91,21 +91,21 @@
     <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <IncludePath>D:\Desktop\VRPN Imager\VRPN %28Binaries%29\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\Desktop\VRPN Imager\VRPN %28Binaries%29\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>D:\Desktop\VRPN v7.32 Builds\include_clean;$(IncludePath)</IncludePath>
+    <LibraryPath>D:\Desktop\VRPN v7.32 Builds\x86\Debug\lib\quat;D:\Desktop\VRPN v7.32 Builds\x86\Debug\lib\vrpn_server;D:\Desktop\VRPN v7.32 Builds\x86\Debug\lib\vrpn;D:\Desktop\VRPN v7.32 Builds\x86\Debug\lib;$(LibraryPath)</LibraryPath>
     <SourcePath>$(SourcePath)</SourcePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <IncludePath>D:\Desktop\VRPN Imager\VRPN-snapshot-Visual-Studio-10\vrpn-install\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\Desktop\VRPN Imager\VRPN-snapshot-Visual-Studio-10\vrpn-install\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>D:\Desktop\VRPN v7.32 Builds\include_clean;$(IncludePath)</IncludePath>
+    <LibraryPath>D:\Desktop\VRPN v7.32 Builds\x86\Release\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>D:\Desktop\VRPN Imager\VRPN-snapshot-Visual-Studio-10 Win64\vrpn-install\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\Desktop\VRPN Imager\VRPN-snapshot-Visual-Studio-10 Win64\vrpn-install\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>D:\Desktop\VRPN v7.32 Builds\include_clean;$(IncludePath)</IncludePath>
+    <LibraryPath>D:\Desktop\VRPN v7.32 Builds\x64\Debug\lib;D:\Desktop\VRPN v7.32 Builds\x64\Debug\lib\vrpn;D:\Desktop\VRPN v7.32 Builds\x64\Debug\lib\vrpn_server;D:\Desktop\VRPN v7.32 Builds\x64\Debug\lib\quat;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>D:\Desktop\VRPN Imager\VRPN-snapshot-Visual-Studio-10 Win64\vrpn-install\include;$(IncludePath)</IncludePath>
-    <LibraryPath>D:\Desktop\VRPN Imager\VRPN-snapshot-Visual-Studio-10 Win64\vrpn-install\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>D:\Desktop\VRPN v7.32 Builds\include_clean;$(IncludePath)</IncludePath>
+    <LibraryPath>D:\Desktop\VRPN v7.32 Builds\x64\Release\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -120,7 +120,7 @@
       <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>vrpnserver.lib; quat.lib</AdditionalDependencies>
+      <AdditionalDependencies>vrpn.lib;vrpn_server.lib;quat.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
@@ -146,7 +146,7 @@
       <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>vrpnserver.lib; quat.lib</AdditionalDependencies>
+      <AdditionalDependencies>vrpn.lib;vrpn_server.lib;quat.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AssemblyDebug>true</AssemblyDebug>
@@ -170,7 +170,7 @@
       <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>vrpnserver.lib; quat.lib</AdditionalDependencies>
+      <AdditionalDependencies>vrpn.lib;vrpn_server.lib;quat.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -194,7 +194,7 @@
       <GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>vrpnserver.lib; quat.lib</AdditionalDependencies>
+      <AdditionalDependencies>vrpn.lib;vrpn_server.lib;quat.lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
diff --git a/VrpnNet/VrpnUtils.cpp b/VrpnNet/VrpnUtils.cpp
index 1fd7cbd..ed7811c 100644
--- a/VrpnNet/VrpnUtils.cpp
+++ b/VrpnNet/VrpnUtils.cpp
@@ -64,10 +64,10 @@ void VrpnUtils::CreateTimeval(System::DateTime time, struct timeval *tm)
 
 void VrpnUtils::CreateQuat(Quaternion quat, double qArray[])
 {
-	qArray[0] = quat.W;
-	qArray[1] = quat.X;
-	qArray[2] = quat.Y;
-	qArray[3] = quat.Z;
+	qArray[0] = quat.X;
+	qArray[1] = quat.Y;
+	qArray[2] = quat.Z;
+	qArray[3] = quat.W;
 }
 
 void VrpnUtils::CreatePoint(Point3D point, double vArray[])
diff --git a/Win32/Debug/VrpnNet.dll b/Win32/Debug/VrpnNet.dll
index 7fd6fa9..b48c5df 100644
Binary files a/Win32/Debug/VrpnNet.dll and b/Win32/Debug/VrpnNet.dll differ
diff --git a/Win32/Release/VrpnNet.dll b/Win32/Release/VrpnNet.dll
index 3976591..3b4850c 100644
Binary files a/Win32/Release/VrpnNet.dll and b/Win32/Release/VrpnNet.dll differ
diff --git a/x64/Debug/VrpnNet.dll b/x64/Debug/VrpnNet.dll
index debfbbd..b1dca2e 100644
Binary files a/x64/Debug/VrpnNet.dll and b/x64/Debug/VrpnNet.dll differ
diff --git a/x64/Release/VrpnNet.dll b/x64/Release/VrpnNet.dll
index 31eb09f..51577e3 100644
Binary files a/x64/Release/VrpnNet.dll and b/x64/Release/VrpnNet.dll differ