diff --git a/CW_Core_Tests/CW_Core_Tests.csproj b/CW_Core_Tests/CW_Core_Tests.csproj
new file mode 100644
index 0000000..aa2f23f
--- /dev/null
+++ b/CW_Core_Tests/CW_Core_Tests.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0-preview-20170628-02" />
+    <PackageReference Include="xunit" Version="2.2.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/CW_Core_Tests/UnitTest1.cs b/CW_Core_Tests/UnitTest1.cs
new file mode 100644
index 0000000..4024bcb
--- /dev/null
+++ b/CW_Core_Tests/UnitTest1.cs
@@ -0,0 +1,14 @@
+using System;
+using Xunit;
+
+namespace CW_Core_Tests
+{
+    public class UnitTest1
+    {
+        [Fact]
+        public void Test1()
+        {
+
+        }
+    }
+}
diff --git a/Console.Waterworks.Core.sln b/Console.Waterworks.Core.sln
index c31020b..dac6355 100644
--- a/Console.Waterworks.Core.sln
+++ b/Console.Waterworks.Core.sln
@@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console.Waterworks.Core", "
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CW_Core_Console", "CW_Core_Console\CW_Core_Console.csproj", "{FE969A76-153C-4691-8561-98F6426BB786}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CW_Core_Tests", "CW_Core_Tests\CW_Core_Tests.csproj", "{B36C3922-1786-4E8D-9016-2EAD5E806D19}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,6 +23,10 @@ Global
 		{FE969A76-153C-4691-8561-98F6426BB786}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FE969A76-153C-4691-8561-98F6426BB786}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE969A76-153C-4691-8561-98F6426BB786}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B36C3922-1786-4E8D-9016-2EAD5E806D19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B36C3922-1786-4E8D-9016-2EAD5E806D19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B36C3922-1786-4E8D-9016-2EAD5E806D19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B36C3922-1786-4E8D-9016-2EAD5E806D19}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE