diff --git a/CredWrite/CredWrite.props b/CredWrite/CredWrite.props
index 2b4b508..b20e0cd 100644
--- a/CredWrite/CredWrite.props
+++ b/CredWrite/CredWrite.props
@@ -7,7 +7,8 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\EAPMethods\EAPMethodEvents\temp\EAPMethodEvents.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>EAPMETHOD_TYPE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
diff --git a/CredWrite/CredWrite.rc b/CredWrite/CredWrite.rc
index ffc2bf6..3b5e8ac 100644
Binary files a/CredWrite/CredWrite.rc and b/CredWrite/CredWrite.rc differ
diff --git a/CredWrite/CredWrite.vcxproj b/CredWrite/CredWrite.vcxproj
index 3726643..bf84d36 100644
--- a/CredWrite/CredWrite.vcxproj
+++ b/CredWrite/CredWrite.vcxproj
@@ -86,6 +86,7 @@
     <ClInclude Include="StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\EAPMethods\src\EAP.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -98,6 +99,9 @@
     <ResourceCompile Include="CredWrite.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\EAPMethods\EAPMethodEvents\EAPMethodEvents.vcxproj">
+      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>
diff --git a/CredWrite/CredWrite.vcxproj.filters b/CredWrite/CredWrite.vcxproj.filters
index 21c5de5..7e3a58f 100644
--- a/CredWrite/CredWrite.vcxproj.filters
+++ b/CredWrite/CredWrite.vcxproj.filters
@@ -26,6 +26,9 @@
     <ClCompile Include="Main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\EAPMethods\src\EAP.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="CredWrite.rc">
diff --git a/CredWrite/Main.cpp b/CredWrite/Main.cpp
index 81ecb02..06dd825 100644
Binary files a/CredWrite/Main.cpp and b/CredWrite/Main.cpp differ
diff --git a/CredWrite/README.md b/CredWrite/README.md
index 6f68729..b5ff61b 100644
--- a/CredWrite/README.md
+++ b/CredWrite/README.md
@@ -1,5 +1,5 @@
 #CredWrite
-Imports given credentials to Windows Credential Manager for GEANTLink use
+Imports given credentials to Windows Credential Manager for GÉANTLink use
 
 ##Usage
 ```
@@ -16,5 +16,4 @@ Return codes:
 - -1 = Invalid parameters
 - 0  = Success
 - 1  = Error parsing command line
-- 2  = Error encrypting password
-- 3  = Error writing credentials to Credential Manager
+- 2  = Error encrypting password or writing credentials
diff --git a/CredWrite/StdAfx.h b/CredWrite/StdAfx.h
index 6eb48db..5d3a928 100644
Binary files a/CredWrite/StdAfx.h and b/CredWrite/StdAfx.h differ