diff --git a/.gitignore b/.gitignore
index 4f1a4bb..5ec1a0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ Debug
 Release
 *.VC.*
 airspy
+librtlsdr
+build
diff --git a/decoder/xritDecoder.vcxproj b/decoder/xritDecoder.vcxproj
index fae965a..806af23 100644
--- a/decoder/xritDecoder.vcxproj
+++ b/decoder/xritDecoder.vcxproj
@@ -59,7 +59,7 @@
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
@@ -161,7 +161,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;MAJOR_VERSION=1;MINOR_VERSION=0;MAINT_VERSION=2;GIT_SHA1=Microsoft Visual C++ Compiler</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;MAJOR_VERSION=1;MINOR_VERSION=0;MAINT_VERSION=3;GIT_SHA1=Microsoft Visual C++ Compiler</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
     </ClCompile>
     <Link>
diff --git a/demodulator/src/HackRFFrontend.cpp b/demodulator/src/HackRFFrontend.cpp
index 31f388a..11fb2f5 100644
--- a/demodulator/src/HackRFFrontend.cpp
+++ b/demodulator/src/HackRFFrontend.cpp
@@ -5,6 +5,7 @@
  *      Author: Lucas Teske
  */
 
+#if 0
 #include "HackRFFrontend.h"
 #include <SatHelper/exceptions.h>
 #include <iostream>
@@ -222,3 +223,4 @@ uint32_t HackRFFrontend::GetSampleRate() {
 void HackRFFrontend::SetSamplesAvailableCallback(std::function<void(void*data, int length, int type)> cb) {
 	this->cb = cb;
 }
+#endif
\ No newline at end of file
diff --git a/demodulator/src/HackRFFrontend.h b/demodulator/src/HackRFFrontend.h
index bbcd487..16b4282 100644
--- a/demodulator/src/HackRFFrontend.h
+++ b/demodulator/src/HackRFFrontend.h
@@ -5,6 +5,8 @@
  *      Author: Lucas Teske
  */
 
+#if 0
+
 #ifndef SRC_HACKRFFRONTEND_H_
 #define SRC_HACKRFFRONTEND_H_
 
@@ -61,3 +63,5 @@ class HackRFFrontend: public FrontendDevice {
 };
 
 #endif /* SRC_HACKRFFRONTEND_H_ */
+
+#endif
\ No newline at end of file
diff --git a/demodulator/src/demodulator.cpp b/demodulator/src/demodulator.cpp
index 81488f3..100890e 100644
--- a/demodulator/src/demodulator.cpp
+++ b/demodulator/src/demodulator.cpp
@@ -357,12 +357,14 @@ int main(int argc, char **argv) {
 				device = new RtlFrontend(deviceNumber);
 				device->SetSampleRate(sampleRate);
 				device->SetCenterFrequency(centerFrequency);
+#if 0
 			} else if (parser[CFG_DEVICE_TYPE] == "hackrf") {
 				std::cout << "HackRF Frontend selected. Device Number: " << deviceNumber << std::endl;
 				HackRFFrontend::Initialize();
 				device = new HackRFFrontend(deviceNumber);
 				device->SetSampleRate(sampleRate);
 				device->SetCenterFrequency(centerFrequency);
+#endif
 	#ifdef NON_FREE
 			} else if (parser[CFG_DEVICE_TYPE] == "sdrplay") {
 				std::cout << "SDRPlay Frontend selected." << std::endl;
diff --git a/demodulator/xritDemodulator.vcxproj b/demodulator/xritDemodulator.vcxproj
index 006a72f..289726e 100644
--- a/demodulator/xritDemodulator.vcxproj
+++ b/demodulator/xritDemodulator.vcxproj
@@ -30,7 +30,7 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v140</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <UseOfMfc>Static</UseOfMfc>
+    <UseOfMfc>false</UseOfMfc>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -87,8 +87,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
-    <LibraryPath>..\sathelper;..\correct;..\airspy;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
-    <IncludePath>..\sathelper;..\correct;..\airspy;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <LibraryPath>..\librtlsdr;..\sathelper;..\correct;..\airspy;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
+    <IncludePath>..\librtlsdr\include;..\sathelper;..\correct;..\airspy;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -133,14 +133,14 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;MAJOR_VERSION=1;MINOR_VERSION=0;MAINT_VERSION=2;GIT_SHA1=Microsoft Visual C++ Compiler</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_USE_MATH_DEFINES;_CRT_SECURE_NO_WARNINGS;MAJOR_VERSION=1;MINOR_VERSION=0;MAINT_VERSION=3;GIT_SHA1=Microsoft Visual C++ Compiler</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>SatHelper.lib;libcorrect.lib;airspy.lib</AdditionalDependencies>
+      <AdditionalDependencies>SatHelper.lib;libcorrect.lib;airspy.lib;librtlsdr.lib</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -168,7 +168,10 @@
     <ClInclude Include="src\DiagManager.h" />
     <ClInclude Include="src\ExitHandler.h" />
     <ClInclude Include="src\FrontendDevice.h" />
+    <ClInclude Include="src\HackRFFrontend.h" />
     <ClInclude Include="src\Parameters.h" />
+    <ClInclude Include="src\RtlFrontend.h" />
+    <ClInclude Include="src\SDRPlayFrontend.h" />
     <ClInclude Include="src\SymbolManager.h" />
   </ItemGroup>
   <ItemGroup>
@@ -177,6 +180,9 @@
     <ClCompile Include="src\demodulator.cpp" />
     <ClCompile Include="src\DiagManager.cpp" />
     <ClCompile Include="src\ExitHandler.cpp" />
+    <ClCompile Include="src\HackRFFrontend.cpp" />
+    <ClCompile Include="src\RtlFrontend.cpp" />
+    <ClCompile Include="src\SDRPlayFrontend.cpp" />
     <ClCompile Include="src\SymbolManager.cpp" />
   </ItemGroup>
   <ItemGroup>
diff --git a/demodulator/xritDemodulator.vcxproj.filters b/demodulator/xritDemodulator.vcxproj.filters
index adeea93..beda109 100644
--- a/demodulator/xritDemodulator.vcxproj.filters
+++ b/demodulator/xritDemodulator.vcxproj.filters
@@ -39,6 +39,15 @@
     <ClInclude Include="src\ExitHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\HackRFFrontend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\RtlFrontend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SDRPlayFrontend.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\AirspyDevice.cpp">
@@ -59,6 +68,15 @@
     <ClCompile Include="src\ExitHandler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\HackRFFrontend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\RtlFrontend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SDRPlayFrontend.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="xritDemodulator.rc">