diff --git a/EduNetworkBuilder.sln b/EduNetworkBuilder.sln
index 2618384..6d0b6e3 100644
--- a/EduNetworkBuilder.sln
+++ b/EduNetworkBuilder.sln
@@ -1,20 +1,34 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.31101.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EduNetworkBuilder", "EduNetworkBuilder\EduNetworkBuilder.csproj", "{5662A48F-E771-4C29-B120-54D65FBC4A14}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "EduNetworkBuilderSetup", "EduNetworkBuilderSetup\EduNetworkBuilderSetup.wixproj", "{ED45B527-65F5-469D-A818-B13A27BC9840}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{5662A48F-E771-4C29-B120-54D65FBC4A14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5662A48F-E771-4C29-B120-54D65FBC4A14}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5662A48F-E771-4C29-B120-54D65FBC4A14}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5662A48F-E771-4C29-B120-54D65FBC4A14}.Debug|x86.Build.0 = Debug|Any CPU
 		{5662A48F-E771-4C29-B120-54D65FBC4A14}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5662A48F-E771-4C29-B120-54D65FBC4A14}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5662A48F-E771-4C29-B120-54D65FBC4A14}.Release|x86.ActiveCfg = Release|Any CPU
+		{5662A48F-E771-4C29-B120-54D65FBC4A14}.Release|x86.Build.0 = Release|Any CPU
+		{ED45B527-65F5-469D-A818-B13A27BC9840}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{ED45B527-65F5-469D-A818-B13A27BC9840}.Debug|x86.ActiveCfg = Debug|x86
+		{ED45B527-65F5-469D-A818-B13A27BC9840}.Debug|x86.Build.0 = Debug|x86
+		{ED45B527-65F5-469D-A818-B13A27BC9840}.Release|Any CPU.ActiveCfg = Release|x86
+		{ED45B527-65F5-469D-A818-B13A27BC9840}.Release|x86.ActiveCfg = Release|x86
+		{ED45B527-65F5-469D-A818-B13A27BC9840}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/EduNetworkBuilderSetup/EduNetworkBuilderSetup.wixproj b/EduNetworkBuilderSetup/EduNetworkBuilderSetup.wixproj
new file mode 100644
index 0000000..97fd123
--- /dev/null
+++ b/EduNetworkBuilderSetup/EduNetworkBuilderSetup.wixproj
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.10</ProductVersion>
+    <ProjectGuid>ed45b527-65f5-469d-a818-b13a27bc9840</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>EduNetworkBuilderSetup</OutputName>
+    <OutputType>Package</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Product.wxs" />
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
+  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
+    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
+  </Target>
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>
\ No newline at end of file
diff --git a/EduNetworkBuilderSetup/Product.wxs b/EduNetworkBuilderSetup/Product.wxs
new file mode 100644
index 0000000..959ad2c
--- /dev/null
+++ b/EduNetworkBuilderSetup/Product.wxs
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+	<Product Id="*" Name="EduNetworkBuilderSetup" Language="1033" Version="1.0.0.33" Manufacturer="EduNetworkBuilder" UpgradeCode="ff6bf7dd-e8cc-426b-9b10-981a3b7196fd">
+		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+
+		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+		<MediaTemplate />
+
+		<Feature Id="ProductFeature" Title="EduNetworkBuilderSetup" Level="1">
+			<ComponentGroupRef Id="ProductComponents" />
+		</Feature>
+	</Product>
+
+	<Fragment>
+		<Directory Id="TARGETDIR" Name="SourceDir">
+			<Directory Id="ProgramFilesFolder">
+				<Directory Id="INSTALLFOLDER" Name="EduNetworkBuilderSetup" />
+			</Directory>
+		</Directory>
+	</Fragment>
+
+	<Fragment>
+		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
+			<!-- <Component Id="ProductComponent"> -->
+				<!-- TODO: Insert files, registry keys, and other resources here. -->
+			<!-- </Component> -->
+		</ComponentGroup>
+	</Fragment>
+</Wix>