5 files changed, 11 insertions, 9 deletions
diff --git a/SendGrid/SendGrid.suo b/SendGrid/SendGrid.suo
index 9a82799..1b103bc 100755
--- a/SendGrid/SendGrid.suo
+++ b/SendGrid/SendGrid.suo
diff --git a/SendGrid/SendGrid/ISendGrid.cs b/SendGrid/SendGrid/ISendGrid.cs
index e5d3226..20e7114 100755
--- a/SendGrid/SendGrid/ISendGrid.cs
+++ b/SendGrid/SendGrid/ISendGrid.cs
@@ -14,7 +14,7 @@ namespace SendGrid
         String Cc { get; set; }
         String Bcc { get; set; }
         String Subject { get; set; }
-        String Headers { get; set; }
+        IHeader Header { get; set; }
         String Html { get; set; }
         String Text { get; set; }
         String Transport { get; set; }
@@ -59,8 +59,6 @@ namespace SendGrid
         #endregion
 
         #region SMTP API Functions
-        IHeader Header();
-
         void DisableGravatar();
         void DisableOpenTracking();
         void DisableClickTracking();
diff --git a/SendGrid/SendGrid/Mail.csproj b/SendGrid/SendGrid/Mail.csproj
index 141d232..d6b0d55 100755
--- a/SendGrid/SendGrid/Mail.csproj
+++ b/SendGrid/SendGrid/Mail.csproj
@@ -41,9 +41,11 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Header.cs" />
     <Compile Include="IHeader.cs" />
     <Compile Include="ISendGrid.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SendGrid.cs" />
     <Compile Include="Transport\ITransport.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/SendGrid/SendGrid/Transport/ITransport.cs b/SendGrid/SendGrid/Transport/ITransport.cs
index 97ebdb6..92557b1 100755
--- a/SendGrid/SendGrid/Transport/ITransport.cs
+++ b/SendGrid/SendGrid/Transport/ITransport.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace SendGrid.Transport
+namespace SendGrid.Transport
 {
     public interface ITransport
     {
diff --git a/SendGrid/Tests/Tests.csproj b/SendGrid/Tests/Tests.csproj
index 5f8d402..0fcdc86 100755
--- a/SendGrid/Tests/Tests.csproj
+++ b/SendGrid/Tests/Tests.csproj
@@ -52,11 +52,18 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="TestHeader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SendGrid\Mail.csproj">
+      <Project>{3C687BEF-FF50-44AD-8315-2D4237281AF8}</Project>
+      <Name>Mail</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.