Added sites and machine studio module template.

40 files changed, 1205 insertions, 439 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Images/site.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Images/site.png
new file mode 100644
index 000000000..2fee5fafa
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Images/site.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..a6eebb5a8
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/AssemblyInfo.cs
@@ -0,0 +1,19 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+[assembly: AssemblyTitle("Tango - Machine Studio Sites Module")]
+[assembly: AssemblyVersion("1.0.0.1737")]
+
+[assembly: ComVisible(false)]
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.Designer.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..ecefa25e7
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.Designer.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.MachineStudio.Sites.Properties {
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if ((resourceMan == null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.MachineStudio.Sites.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.resx b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.resx
new file mode 100644
index 000000000..af7dbebba
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.Designer.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..5fa894ceb
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.MachineStudio.Sites.Properties
+{
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.settings b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.settings
new file mode 100644
index 000000000..033d7a5e9
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/SitesModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/SitesModule.cs
new file mode 100644
index 000000000..96d3aed49
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/SitesModule.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media.Imaging;
+using Tango.BL.Enumerations;
+using Tango.MachineStudio.Common;
+using Tango.MachineStudio.Sites.Views;
+using Tango.SharedUI.Helpers;
+
+namespace Tango.MachineStudio.Sites
+{
+    [StudioModule(20)]
+    public class SitesModule : StudioModuleBase
+    {
+        public override string Name
+        {
+            get
+            {
+                return "Sites";
+            }
+        }
+
+        public override string Description
+        {
+            get
+            {
+                return "Manage organizations sites and their common machine properties.";
+            }
+        }
+
+        public override BitmapSource Image
+        {
+            get
+            {
+                return ResourceHelper.GetImageFromResources("Images/site.png");
+            }
+        }
+
+        public override Type MainViewType
+        {
+            get
+            {
+                return typeof(MainView);
+            }
+        }
+
+        public override Permissions Permission
+        {
+            get
+            {
+                return Permissions.RunRMLModule;
+            }
+        }
+
+        public override void Dispose()
+        {
+
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Tango.MachineStudio.Sites.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Tango.MachineStudio.Sites.csproj
new file mode 100644
index 000000000..95f71baa8
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Tango.MachineStudio.Sites.csproj
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{18A27902-9881-4556-8163-F6DF2236A14D}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <RootNamespace>Tango.MachineStudio.Sites</RootNamespace>
+    <AssemblyName>Tango.MachineStudio.Sites</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\Build\Machine Studio\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\Build\Machine Studio\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Google.Protobuf, Version=3.4.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Google.Protobuf.3.4.1\lib\net45\Google.Protobuf.dll</HintPath>
+    </Reference>
+    <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignThemes.Wpf, Version=2.3.1.953, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ViewModelLocator.cs" />
+    <Compile Include="ViewModels\MainViewVM.cs" />
+    <Compile Include="Views\MainView.xaml.cs">
+      <DependentUpon>MainView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="SitesModule.cs" />
+    <Page Include="Views\MainView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
+      <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
+      <Name>Tango.BL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Core\Tango.Core.csproj">
+      <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
+      <Name>Tango.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Integration\Tango.Integration.csproj">
+      <Project>{4206ac58-3b57-4699-8835-90bf6db01a61}</Project>
+      <Name>Tango.Integration</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Logging\Tango.Logging.csproj">
+      <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project>
+      <Name>Tango.Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Settings\Tango.Settings.csproj">
+      <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project>
+      <Name>Tango.Settings</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.SharedUI\Tango.SharedUI.csproj">
+      <Project>{8491D07B-C1F6-4B62-A412-41B9FD2D6538}</Project>
+      <Name>Tango.SharedUI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Transport\Tango.Transport.csproj">
+      <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project>
+      <Name>Tango.Transport</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Tango.MachineStudio.Common\Tango.MachineStudio.Common.csproj">
+      <Project>{cb0b0aa2-bb24-4bca-a720-45e397684e12}</Project>
+      <Name>Tango.MachineStudio.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\site.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModelLocator.cs
new file mode 100644
index 000000000..c06ae05e7
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModelLocator.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core.DI;
+using Tango.MachineStudio.Sites.ViewModels;
+
+namespace Tango.MachineStudio.Sites
+{
+    public static class ViewModelLocator
+    {
+        /// <summary>
+        /// Initializes a new instance of the ViewModelLocator class.
+        /// </summary>
+        static ViewModelLocator()
+        {
+            TangoIOC.Default.Register<MainViewVM>();
+        }
+
+        public static MainViewVM MainViewVM
+        {
+            get
+            {
+                return TangoIOC.Default.GetInstance<MainViewVM>();
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/MainViewVM.cs
new file mode 100644
index 000000000..d0be162dd
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/MainViewVM.cs
@@ -0,0 +1,18 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.MachineStudio.Common;
+
+namespace Tango.MachineStudio.Sites.ViewModels
+{
+    public class MainViewVM : StudioViewModel
+    {
+        public override void OnApplicationReady()
+        {
+            
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml
new file mode 100644
index 000000000..80f9ae151
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml
@@ -0,0 +1,15 @@
+<UserControl x:Class="Tango.MachineStudio.Sites.Views.MainView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.MachineStudio.Sites.Views"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.Sites.ViewModels"
+             xmlns:global="clr-namespace:Tango.MachineStudio.Sites"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+    <Grid IsEnabled="{Binding IsFree}">
+        <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="70">Comming soon...</TextBlock>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml.cs
new file mode 100644
index 000000000..75ced5ae2
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Tango.MachineStudio.Sites.Views
+{
+    /// <summary>
+    /// Interaction logic for MainView.xaml
+    /// </summary>
+    public partial class MainView : UserControl
+    {
+        public MainView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/app.config
new file mode 100644
index 000000000..97a204217
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/app.config
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.6.4.0" newVersion="5.6.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Clients.ActiveDirectory" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.5.0" newVersion="5.0.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.2.0" newVersion="1.4.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.FileSystem.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Console" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/packages.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/packages.config
new file mode 100644
index 000000000..fd88f4804
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/packages.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Google.Protobuf" version="3.4.1" targetFramework="net461" />
+  <package id="MahApps.Metro" version="1.5.0" targetFramework="net461" />
+  <package id="MaterialDesignColors" version="1.1.2" targetFramework="net461" />
+  <package id="MaterialDesignThemes" version="2.3.1.953" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 470cfe4c7..635d372c2 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -504,6 +504,10 @@
       <Project>{d0186ac0-0fcf-4d3b-9619-54812b6e524b}</Project>
       <Name>Tango.MachineStudio.RML</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules\Tango.MachineStudio.Sites\Tango.MachineStudio.Sites.csproj">
+      <Project>{18a27902-9881-4556-8163-f6df2236a14d}</Project>
+      <Name>Tango.MachineStudio.Sites</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules\Tango.MachineStudio.Statistics\Tango.MachineStudio.Statistics.csproj">
       <Project>{8a65ad6a-a9b4-48c0-9301-4b7434b712f8}</Project>
       <Name>Tango.MachineStudio.Statistics</Name>
@@ -666,7 +670,7 @@ if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)Roslyn\"</PostBuildEven
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
+      <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/Project Templates/Machine Studio Module.zip b/Software/Visual_Studio/Project Templates/Machine Studio Module.zip
new file mode 100644
index 000000000..b7fb36b94
--- /dev/null
+++ b/Software/Visual_Studio/Project Templates/Machine Studio Module.zip
diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs
index e3adf4e0f..fa82ce992 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/MachineDTOBase.cs
@@ -54,6 +54,14 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
+        /// site guid
+        /// </summary>
+        public String SiteGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// machine version guid
         /// </summary>
         public String MachineVersionGuid 
diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs
index 308438b14..320de2763 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTO.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/SiteDTO.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Tango.BL.DTO
 {
-    public class MachinesRmlDTO : MachinesRmlDTOBase
+    public class SiteDTO : SiteDTOBase
     {
 
     }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs
index 339e846af..47d7acc95 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/SiteDTOBase.cs
@@ -18,7 +18,7 @@ using Tango.BL.Entities;
 
 namespace Tango.BL.DTO
 {
-    public abstract class OrganizationsRmlDTOBase : ObservableEntityDTO<OrganizationsRmlDTO, OrganizationsRml>
+    public abstract class SiteDTOBase : ObservableEntityDTO<SiteDTO, Site>
     {
 
         /// <summary>
@@ -30,9 +30,17 @@ namespace Tango.BL.DTO
         }
 
         /// <summary>
-        /// rml guid
+        /// name
         /// </summary>
-        public String RmlGuid 
+        public String Name 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// description
+        /// </summary>
+        public String Description 
         {
             get; set; 
         }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs
index 796c1812d..527d710d0 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/OrganizationsRmlDTO.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTO.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace Tango.BL.DTO
 {
-    public class OrganizationsRmlDTO : OrganizationsRmlDTOBase
+    public class SitesRmlDTO : SitesRmlDTOBase
     {
 
     }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs
index 5ae7d3992..1373fedd6 100644
--- a/Software/Visual_Studio/Tango.BL/DTO/MachinesRmlDTOBase.cs
+++ b/Software/Visual_Studio/Tango.BL/DTO/SitesRmlDTOBase.cs
@@ -18,13 +18,13 @@ using Tango.BL.Entities;
 
 namespace Tango.BL.DTO
 {
-    public abstract class MachinesRmlDTOBase : ObservableEntityDTO<MachinesRmlDTO, MachinesRml>
+    public abstract class SitesRmlDTOBase : ObservableEntityDTO<SitesRmlDTO, SitesRml>
     {
 
         /// <summary>
-        /// machine guid
+        /// site guid
         /// </summary>
-        public String MachineGuid 
+        public String SiteGuid 
         {
             get; set; 
         }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs
index de376da41..bbc55d245 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs
@@ -131,6 +131,8 @@ namespace Tango.BL.Entities
         [Column("VOLTAGE")]
 
         [Description("Voltage Description")]
+        [Range(-10000,1000000)]
+
         public  Double Voltage
         {
             get 
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs
index 4f989aeb2..c02b103dd 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/MachineBase.cs
@@ -197,6 +197,31 @@ namespace Tango.BL.Entities
             }
         }
 
+        protected String _siteguid;
+
+        /// <summary>
+        /// Gets or sets the machinebase site guid.
+        /// </summary>
+
+        [Column("SITE_GUID")]
+
+        public  String SiteGuid
+        {
+            get 
+            {
+                return _siteguid; 
+            }
+
+            set 
+            {
+                if (_siteguid != value)
+                {
+                    _siteguid = value;
+
+                }
+            }
+        }
+
         protected String _machineversionguid;
 
         /// <summary>
diff --git a/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRmlBase.cs
deleted file mode 100644
index d1f338428..000000000
--- a/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRmlBase.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-// This code was generated by a tool.
-// Tango Observables Generator
-// 
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated. Do not modify!
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Xml.Serialization;
-using Newtonsoft.Json;
-using System.Linq;
-using Tango.DAL.Remote.DB;
-using Tango.Core;
-using System.ComponentModel;
-
-namespace Tango.BL.Entities
-{
-    [Table("ORGANIZATIONS_RMLS")]
-    public abstract class OrganizationsRmlBase : ObservableEntity<OrganizationsRml>
-    {
-
-        protected String _organizationguid;
-
-        /// <summary>
-        /// Gets or sets the organizationsrmlbase organization guid.
-        /// </summary>
-
-        [Column("ORGANIZATION_GUID")]
-
-        public  String OrganizationGuid
-        {
-            get 
-            {
-                return _organizationguid; 
-            }
-
-            set 
-            {
-                if (_organizationguid != value)
-                {
-                    _organizationguid = value;
-
-                }
-            }
-        }
-
-        protected String _rmlguid;
-
-        /// <summary>
-        /// Gets or sets the organizationsrmlbase rml guid.
-        /// </summary>
-
-        [Column("RML_GUID")]
-
-        public  String RmlGuid
-        {
-            get 
-            {
-                return _rmlguid; 
-            }
-
-            set 
-            {
-                if (_rmlguid != value)
-                {
-                    _rmlguid = value;
-
-                }
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OrganizationsRmlBase" /> class.
-        /// </summary>
-        public OrganizationsRmlBase() : base()
-        {
-        }
-    }
-}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesRml.cs b/Software/Visual_Studio/Tango.BL/Entities/Site.cs
index 6fe2ef16e..d88a00567 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachinesRml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/Site.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Tango.BL.Entities
 {
-    public class MachinesRml : MachinesRmlBase
+    public class Site : SiteBase
     {
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs
new file mode 100644
index 000000000..4294b2daf
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/SiteBase.cs
@@ -0,0 +1,137 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by a tool.
+// Tango Observables Generator
+// 
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated. Do not modify!
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+using Tango.Core;
+using System.ComponentModel;
+
+namespace Tango.BL.Entities
+{
+    [Table("SITES")]
+    public abstract class SiteBase : ObservableEntity<Site>
+    {
+
+        public event EventHandler<String> NameChanged;
+
+        public event EventHandler<String> DescriptionChanged;
+
+        protected String _organizationguid;
+
+        /// <summary>
+        /// Gets or sets the sitebase organization guid.
+        /// </summary>
+
+        [Column("ORGANIZATION_GUID")]
+
+        public  String OrganizationGuid
+        {
+            get 
+            {
+                return _organizationguid; 
+            }
+
+            set 
+            {
+                if (_organizationguid != value)
+                {
+                    _organizationguid = value;
+
+                }
+            }
+        }
+
+        protected String _name;
+
+        /// <summary>
+        /// Gets or sets the sitebase name.
+        /// </summary>
+
+        [Column("NAME")]
+
+        public  String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                if (_name != value)
+                {
+                    _name = value;
+
+                    OnNameChanged(value);
+
+                }
+            }
+        }
+
+        protected String _description;
+
+        /// <summary>
+        /// Gets or sets the sitebase description.
+        /// </summary>
+
+        [Column("DESCRIPTION")]
+
+        public  String Description
+        {
+            get 
+            {
+                return _description; 
+            }
+
+            set 
+            {
+                if (_description != value)
+                {
+                    _description = value;
+
+                    OnDescriptionChanged(value);
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when the Name has changed.
+        /// </summary>
+        protected virtual void OnNameChanged(String name)
+        {
+            NameChanged?.Invoke(this, name);
+            RaisePropertyChanged(nameof(Name));
+        }
+
+        /// <summary>
+        /// Called when the Description has changed.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(String description)
+        {
+            DescriptionChanged?.Invoke(this, description);
+            RaisePropertyChanged(nameof(Description));
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SiteBase" /> class.
+        /// </summary>
+        public SiteBase() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRml.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesRml.cs
index 70c8fb66f..1d6dafe8b 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/OrganizationsRml.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/SitesRml.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
 
 namespace Tango.BL.Entities
 {
-    public class OrganizationsRml : OrganizationsRmlBase
+    public class SitesRml : SitesRmlBase
     {
     }
 }
diff --git a/Software/Visual_Studio/Tango.BL/Entities/MachinesRmlBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs
index efb9cd997..0538069b4 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/MachinesRmlBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/SitesRmlBase.cs
@@ -22,30 +22,30 @@ using System.ComponentModel;
 
 namespace Tango.BL.Entities
 {
-    [Table("MACHINES_RMLS")]
-    public abstract class MachinesRmlBase : ObservableEntity<MachinesRml>
+    [Table("SITES_RMLS")]
+    public abstract class SitesRmlBase : ObservableEntity<SitesRml>
     {
 
-        protected String _machineguid;
+        protected String _siteguid;
 
         /// <summary>
-        /// Gets or sets the machinesrmlbase machine guid.
+        /// Gets or sets the sitesrmlbase site guid.
         /// </summary>
 
-        [Column("MACHINE_GUID")]
+        [Column("SITE_GUID")]
 
-        public  String MachineGuid
+        public  String SiteGuid
         {
             get 
             {
-                return _machineguid; 
+                return _siteguid; 
             }
 
             set 
             {
-                if (_machineguid != value)
+                if (_siteguid != value)
                 {
-                    _machineguid = value;
+                    _siteguid = value;
 
                 }
             }
@@ -54,7 +54,7 @@ namespace Tango.BL.Entities
         protected String _rmlguid;
 
         /// <summary>
-        /// Gets or sets the machinesrmlbase rml guid.
+        /// Gets or sets the sitesrmlbase rml guid.
         /// </summary>
 
         [Column("RML_GUID")]
@@ -77,9 +77,9 @@ namespace Tango.BL.Entities
         }
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="MachinesRmlBase" /> class.
+        /// Initializes a new instance of the <see cref="SitesRmlBase" /> class.
         /// </summary>
-        public MachinesRmlBase() : base()
+        public SitesRmlBase() : base()
         {
         }
     }
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
index 25c3b5682..d47f6514b 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
@@ -415,14 +415,6 @@ namespace Tango.BL
         }
 
         /// <summary>
-        /// Gets or sets the MachinesRmls.
-        /// </summary>
-        public DbSet<MachinesRml> MachinesRmls 
-        {
-            get; set; 
-        }
-
-        /// <summary>
         /// Gets or sets the MediaConditions.
         /// </summary>
         public DbSet<MediaCondition> MediaConditions 
@@ -463,14 +455,6 @@ namespace Tango.BL
         }
 
         /// <summary>
-        /// Gets or sets the OrganizationsRmls.
-        /// </summary>
-        public DbSet<OrganizationsRml> OrganizationsRmls 
-        {
-            get; set; 
-        }
-
-        /// <summary>
         /// Gets or sets the Permissions.
         /// </summary>
         public DbSet<Permission> Permissions 
@@ -527,6 +511,22 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the Sites.
+        /// </summary>
+        public DbSet<Site> Sites 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the SitesRmls.
+        /// </summary>
+        public DbSet<SitesRml> SitesRmls 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// Gets or sets the SpoolTypes.
         /// </summary>
         public DbSet<SpoolType> SpoolTypes 
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
index cb259995b..139c90158 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
@@ -1781,42 +1781,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<MachinesRml> _machinesrmls;
-        /// <summary>
-        /// Gets or sets the MachinesRmls.
-        /// </summary>
-        public ObservableCollection<MachinesRml> MachinesRmls
-        {
-            get 
-            {
-                return _machinesrmls; 
-            }
-
-            set 
-            {
-                _machinesrmls = value; RaisePropertyChanged(nameof(MachinesRmls)); 
-            }
-
-        }
-
-        private ICollectionView _machinesrmlsViewSource;
-        /// <summary>
-        /// Gets or sets the MachinesRmls View Source.
-        ///</summary>
-        public ICollectionView MachinesRmlsViewSource
-        {
-            get 
-            {
-                return _machinesrmlsViewSource; 
-            }
-
-            set 
-            {
-                _machinesrmlsViewSource = value; RaisePropertyChanged(nameof(MachinesRmlsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<MediaCondition> _mediaconditions;
         /// <summary>
         /// Gets or sets the MediaConditions.
@@ -1997,42 +1961,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<OrganizationsRml> _organizationsrmls;
-        /// <summary>
-        /// Gets or sets the OrganizationsRmls.
-        /// </summary>
-        public ObservableCollection<OrganizationsRml> OrganizationsRmls
-        {
-            get 
-            {
-                return _organizationsrmls; 
-            }
-
-            set 
-            {
-                _organizationsrmls = value; RaisePropertyChanged(nameof(OrganizationsRmls)); 
-            }
-
-        }
-
-        private ICollectionView _organizationsrmlsViewSource;
-        /// <summary>
-        /// Gets or sets the OrganizationsRmls View Source.
-        ///</summary>
-        public ICollectionView OrganizationsRmlsViewSource
-        {
-            get 
-            {
-                return _organizationsrmlsViewSource; 
-            }
-
-            set 
-            {
-                _organizationsrmlsViewSource = value; RaisePropertyChanged(nameof(OrganizationsRmlsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<Permission> _permissions;
         /// <summary>
         /// Gets or sets the Permissions.
@@ -2285,6 +2213,78 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<Site> _sites;
+        /// <summary>
+        /// Gets or sets the Sites.
+        /// </summary>
+        public ObservableCollection<Site> Sites
+        {
+            get 
+            {
+                return _sites; 
+            }
+
+            set 
+            {
+                _sites = value; RaisePropertyChanged(nameof(Sites)); 
+            }
+
+        }
+
+        private ICollectionView _sitesViewSource;
+        /// <summary>
+        /// Gets or sets the Sites View Source.
+        ///</summary>
+        public ICollectionView SitesViewSource
+        {
+            get 
+            {
+                return _sitesViewSource; 
+            }
+
+            set 
+            {
+                _sitesViewSource = value; RaisePropertyChanged(nameof(SitesViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<SitesRml> _sitesrmls;
+        /// <summary>
+        /// Gets or sets the SitesRmls.
+        /// </summary>
+        public ObservableCollection<SitesRml> SitesRmls
+        {
+            get 
+            {
+                return _sitesrmls; 
+            }
+
+            set 
+            {
+                _sitesrmls = value; RaisePropertyChanged(nameof(SitesRmls)); 
+            }
+
+        }
+
+        private ICollectionView _sitesrmlsViewSource;
+        /// <summary>
+        /// Gets or sets the SitesRmls View Source.
+        ///</summary>
+        public ICollectionView SitesRmlsViewSource
+        {
+            get 
+            {
+                return _sitesrmlsViewSource; 
+            }
+
+            set 
+            {
+                _sitesrmlsViewSource = value; RaisePropertyChanged(nameof(SitesRmlsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<SpoolType> _spooltypes;
         /// <summary>
         /// Gets or sets the SpoolTypes.
@@ -2893,8 +2893,6 @@ namespace Tango.BL
 
             MachinesEventsViewSource = CreateCollectionView(MachinesEvents);
 
-            MachinesRmlsViewSource = CreateCollectionView(MachinesRmls);
-
             MediaConditionsViewSource = CreateCollectionView(MediaConditions);
 
             MediaMaterialsViewSource = CreateCollectionView(MediaMaterials);
@@ -2905,8 +2903,6 @@ namespace Tango.BL
 
             OrganizationsViewSource = CreateCollectionView(Organizations);
 
-            OrganizationsRmlsViewSource = CreateCollectionView(OrganizationsRmls);
-
             PermissionsViewSource = CreateCollectionView(Permissions);
 
             ProcessParametersTablesViewSource = CreateCollectionView(ProcessParametersTables);
@@ -2921,6 +2917,10 @@ namespace Tango.BL
 
             SegmentsViewSource = CreateCollectionView(Segments);
 
+            SitesViewSource = CreateCollectionView(Sites);
+
+            SitesRmlsViewSource = CreateCollectionView(SitesRmls);
+
             SpoolTypesViewSource = CreateCollectionView(SpoolTypes);
 
             SpoolsViewSource = CreateCollectionView(Spools);
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
index 3b24aa506..e509d0e3c 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
@@ -1781,42 +1781,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<MachinesRml> _machinesrmls;
-        /// <summary>
-        /// Gets or sets the MachinesRmls.
-        /// </summary>
-        public ObservableCollection<MachinesRml> MachinesRmls
-        {
-            get 
-            {
-                return _machinesrmls; 
-            }
-
-            set 
-            {
-                _machinesrmls = value; RaisePropertyChanged(nameof(MachinesRmls)); 
-            }
-
-        }
-
-        private ICollectionView _machinesrmlsViewSource;
-        /// <summary>
-        /// Gets or sets the MachinesRmls View Source.
-        ///</summary>
-        public ICollectionView MachinesRmlsViewSource
-        {
-            get 
-            {
-                return _machinesrmlsViewSource; 
-            }
-
-            set 
-            {
-                _machinesrmlsViewSource = value; RaisePropertyChanged(nameof(MachinesRmlsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<MediaCondition> _mediaconditions;
         /// <summary>
         /// Gets or sets the MediaConditions.
@@ -1997,42 +1961,6 @@ namespace Tango.BL
 
         }
 
-        private ObservableCollection<OrganizationsRml> _organizationsrmls;
-        /// <summary>
-        /// Gets or sets the OrganizationsRmls.
-        /// </summary>
-        public ObservableCollection<OrganizationsRml> OrganizationsRmls
-        {
-            get 
-            {
-                return _organizationsrmls; 
-            }
-
-            set 
-            {
-                _organizationsrmls = value; RaisePropertyChanged(nameof(OrganizationsRmls)); 
-            }
-
-        }
-
-        private ICollectionView _organizationsrmlsViewSource;
-        /// <summary>
-        /// Gets or sets the OrganizationsRmls View Source.
-        ///</summary>
-        public ICollectionView OrganizationsRmlsViewSource
-        {
-            get 
-            {
-                return _organizationsrmlsViewSource; 
-            }
-
-            set 
-            {
-                _organizationsrmlsViewSource = value; RaisePropertyChanged(nameof(OrganizationsRmlsViewSource)); 
-            }
-
-        }
-
         private ObservableCollection<Permission> _permissions;
         /// <summary>
         /// Gets or sets the Permissions.
@@ -2285,6 +2213,78 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<Site> _sites;
+        /// <summary>
+        /// Gets or sets the Sites.
+        /// </summary>
+        public ObservableCollection<Site> Sites
+        {
+            get 
+            {
+                return _sites; 
+            }
+
+            set 
+            {
+                _sites = value; RaisePropertyChanged(nameof(Sites)); 
+            }
+
+        }
+
+        private ICollectionView _sitesViewSource;
+        /// <summary>
+        /// Gets or sets the Sites View Source.
+        ///</summary>
+        public ICollectionView SitesViewSource
+        {
+            get 
+            {
+                return _sitesViewSource; 
+            }
+
+            set 
+            {
+                _sitesViewSource = value; RaisePropertyChanged(nameof(SitesViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<SitesRml> _sitesrmls;
+        /// <summary>
+        /// Gets or sets the SitesRmls.
+        /// </summary>
+        public ObservableCollection<SitesRml> SitesRmls
+        {
+            get 
+            {
+                return _sitesrmls; 
+            }
+
+            set 
+            {
+                _sitesrmls = value; RaisePropertyChanged(nameof(SitesRmls)); 
+            }
+
+        }
+
+        private ICollectionView _sitesrmlsViewSource;
+        /// <summary>
+        /// Gets or sets the SitesRmls View Source.
+        ///</summary>
+        public ICollectionView SitesRmlsViewSource
+        {
+            get 
+            {
+                return _sitesrmlsViewSource; 
+            }
+
+            set 
+            {
+                _sitesrmlsViewSource = value; RaisePropertyChanged(nameof(SitesRmlsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<SpoolType> _spooltypes;
         /// <summary>
         /// Gets or sets the SpoolTypes.
@@ -2893,8 +2893,6 @@ namespace Tango.BL
 
             MachinesEventsViewSource = CreateCollectionView(MachinesEvents);
 
-            MachinesRmlsViewSource = CreateCollectionView(MachinesRmls);
-
             MediaConditionsViewSource = CreateCollectionView(MediaConditions);
 
             MediaMaterialsViewSource = CreateCollectionView(MediaMaterials);
@@ -2905,8 +2903,6 @@ namespace Tango.BL
 
             OrganizationsViewSource = CreateCollectionView(Organizations);
 
-            OrganizationsRmlsViewSource = CreateCollectionView(OrganizationsRmls);
-
             PermissionsViewSource = CreateCollectionView(Permissions);
 
             ProcessParametersTablesViewSource = CreateCollectionView(ProcessParametersTables);
@@ -2921,6 +2917,10 @@ namespace Tango.BL
 
             SegmentsViewSource = CreateCollectionView(Segments);
 
+            SitesViewSource = CreateCollectionView(Sites);
+
+            SitesRmlsViewSource = CreateCollectionView(SitesRmls);
+
             SpoolTypesViewSource = CreateCollectionView(SpoolTypes);
 
             SpoolsViewSource = CreateCollectionView(Spools);
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index c3c1b9ab9..d75cdc0c1 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -206,8 +206,6 @@
     <Compile Include="DTO\MachineDTOBase.cs" />
     <Compile Include="DTO\MachinesEventDTO.cs" />
     <Compile Include="DTO\MachinesEventDTOBase.cs" />
-    <Compile Include="DTO\MachinesRmlDTO.cs" />
-    <Compile Include="DTO\MachinesRmlDTOBase.cs" />
     <Compile Include="DTO\MachineStudioVersionDTO.cs" />
     <Compile Include="DTO\MachineStudioVersionDTOBase.cs" />
     <Compile Include="DTO\MachineVersionDTO.cs" />
@@ -222,8 +220,6 @@
     <Compile Include="DTO\MidTankTypeDTOBase.cs" />
     <Compile Include="DTO\OrganizationDTO.cs" />
     <Compile Include="DTO\OrganizationDTOBase.cs" />
-    <Compile Include="DTO\OrganizationsRmlDTO.cs" />
-    <Compile Include="DTO\OrganizationsRmlDTOBase.cs" />
     <Compile Include="DTO\PermissionDTO.cs" />
     <Compile Include="DTO\PermissionDTOBase.cs" />
     <Compile Include="DTO\ProcessParametersTableDTO.cs" />
@@ -238,6 +234,10 @@
     <Compile Include="DTO\RolesPermissionDTOBase.cs" />
     <Compile Include="DTO\SegmentDTO.cs" />
     <Compile Include="DTO\SegmentDTOBase.cs" />
+    <Compile Include="DTO\SiteDTO.cs" />
+    <Compile Include="DTO\SiteDTOBase.cs" />
+    <Compile Include="DTO\SitesRmlDTO.cs" />
+    <Compile Include="DTO\SitesRmlDTOBase.cs" />
     <Compile Include="DTO\SpoolDTO.cs" />
     <Compile Include="DTO\SpoolDTOBase.cs" />
     <Compile Include="DTO\SpoolTypeDTO.cs" />
@@ -323,8 +323,6 @@
     <Compile Include="Entities\LiquidTypesRmlBase.cs" />
     <Compile Include="Entities\MachineBase.cs" />
     <Compile Include="Entities\MachinesEventBase.cs" />
-    <Compile Include="Entities\MachinesRml.cs" />
-    <Compile Include="Entities\MachinesRmlBase.cs" />
     <Compile Include="Entities\MachineStudioVersionBase.cs" />
     <Compile Include="Entities\MachineVersionBase.cs" />
     <Compile Include="Entities\MediaConditionBase.cs" />
@@ -332,8 +330,6 @@
     <Compile Include="Entities\MediaPurposBase.cs" />
     <Compile Include="Entities\MidTankTypeBase.cs" />
     <Compile Include="Entities\OrganizationBase.cs" />
-    <Compile Include="Entities\OrganizationsRml.cs" />
-    <Compile Include="Entities\OrganizationsRmlBase.cs" />
     <Compile Include="Entities\PermissionBase.cs" />
     <Compile Include="Entities\ProcessParametersTableBase.cs" />
     <Compile Include="Entities\ProcessParametersTablesGroupBase.cs" />
@@ -341,6 +337,10 @@
     <Compile Include="Entities\RoleBase.cs" />
     <Compile Include="Entities\RolesPermissionBase.cs" />
     <Compile Include="Entities\SegmentBase.cs" />
+    <Compile Include="Entities\Site.cs" />
+    <Compile Include="Entities\SiteBase.cs" />
+    <Compile Include="Entities\SitesRml.cs" />
+    <Compile Include="Entities\SitesRmlBase.cs" />
     <Compile Include="Entities\Spool.cs" />
     <Compile Include="Entities\SpoolBase.cs" />
     <Compile Include="Entities\SpoolTypeBase.cs" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
index 9e83e7e4d..0508fc99e 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
@@ -30,6 +30,7 @@ namespace Tango.DAL.Remote.DB
         public string NAME { get; set; }
         public System.DateTime PRODUCTION_DATE { get; set; }
         public string ORGANIZATION_GUID { get; set; }
+        public string SITE_GUID { get; set; }
         public string MACHINE_VERSION_GUID { get; set; }
         public string CONFIGURATION_GUID { get; set; }
         public string DEFAULT_RML_GUID { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
index fc248bbfe..9f81121ca 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -74,13 +74,11 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<MACHINE_VERSIONS> MACHINE_VERSIONS { get; set; }
         public virtual DbSet<MACHINE> MACHINES { get; set; }
         public virtual DbSet<MACHINES_EVENTS> MACHINES_EVENTS { get; set; }
-        public virtual DbSet<MACHINES_RMLS> MACHINES_RMLS { get; set; }
         public virtual DbSet<MEDIA_CONDITIONS> MEDIA_CONDITIONS { get; set; }
         public virtual DbSet<MEDIA_MATERIALS> MEDIA_MATERIALS { get; set; }
         public virtual DbSet<MEDIA_PURPOSES> MEDIA_PURPOSES { get; set; }
         public virtual DbSet<MID_TANK_TYPES> MID_TANK_TYPES { get; set; }
         public virtual DbSet<ORGANIZATION> ORGANIZATIONS { get; set; }
-        public virtual DbSet<ORGANIZATIONS_RMLS> ORGANIZATIONS_RMLS { get; set; }
         public virtual DbSet<PERMISSION> PERMISSIONS { get; set; }
         public virtual DbSet<PROCESS_PARAMETERS_TABLES> PROCESS_PARAMETERS_TABLES { get; set; }
         public virtual DbSet<PROCESS_PARAMETERS_TABLES_GROUPS> PROCESS_PARAMETERS_TABLES_GROUPS { get; set; }
@@ -88,6 +86,8 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<ROLE> ROLES { get; set; }
         public virtual DbSet<ROLES_PERMISSIONS> ROLES_PERMISSIONS { get; set; }
         public virtual DbSet<SEGMENT> SEGMENTS { get; set; }
+        public virtual DbSet<SITE> SITES { get; set; }
+        public virtual DbSet<SITES_RMLS> SITES_RMLS { get; set; }
         public virtual DbSet<SPOOL_TYPES> SPOOL_TYPES { get; set; }
         public virtual DbSet<SPOOL> SPOOLS { get; set; }
         public virtual DbSet<sysdiagram> sysdiagrams { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 44dffd473..2c003669e 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -708,6 +708,7 @@
           <Property Name="NAME" Type="nvarchar" MaxLength="50" />
           <Property Name="PRODUCTION_DATE" Type="datetime" Nullable="false" />
           <Property Name="ORGANIZATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="SITE_GUID" Type="varchar" MaxLength="36" />
           <Property Name="MACHINE_VERSION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="CONFIGURATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="DEFAULT_RML_GUID" Type="varchar" MaxLength="36" />
@@ -749,16 +750,6 @@
           <Property Name="DESCRIPTION" Type="nvarchar(max)" />
           <Property Name="IS_SYNCHRONIZED" Type="bit" Nullable="false" />
         </EntityType>
-        <EntityType Name="MACHINES_RMLS">
-          <Key>
-            <PropertyRef Name="GUID" />
-          </Key>
-          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
-          <Property Name="MACHINE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-        </EntityType>
         <EntityType Name="MEDIA_CONDITIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -811,16 +802,6 @@
           <Property Name="CONTACT_GUID" Type="varchar" MaxLength="36" Nullable="false" />
           <Property Name="ADDRESS_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
-        <EntityType Name="ORGANIZATIONS_RMLS">
-          <Key>
-            <PropertyRef Name="GUID" />
-          </Key>
-          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
-          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
-          <Property Name="ORGANIZATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-          <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
-        </EntityType>
         <EntityType Name="PERMISSIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -941,6 +922,27 @@
           <Property Name="LENGTH" Type="float" Nullable="false" />
           <Property Name="SEGMENT_INDEX" Type="int" Nullable="false" />
         </EntityType>
+        <EntityType Name="SITES">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="ORGANIZATION_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="100" Nullable="false" />
+          <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="200" />
+        </EntityType>
+        <EntityType Name="SITES_RMLS">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime2" Precision="3" Nullable="false" />
+          <Property Name="SITE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
         <EntityType Name="SPOOL_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -2237,13 +2239,11 @@
           <EntitySet Name="MACHINE_VERSIONS" EntityType="Self.MACHINE_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MACHINES" EntityType="Self.MACHINES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MACHINES_EVENTS" EntityType="Self.MACHINES_EVENTS" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="MACHINES_RMLS" EntityType="Self.MACHINES_RMLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MEDIA_CONDITIONS" EntityType="Self.MEDIA_CONDITIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MEDIA_MATERIALS" EntityType="Self.MEDIA_MATERIALS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MEDIA_PURPOSES" EntityType="Self.MEDIA_PURPOSES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="MID_TANK_TYPES" EntityType="Self.MID_TANK_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ORGANIZATIONS" EntityType="Self.ORGANIZATIONS" Schema="dbo" store:Type="Tables" />
-          <EntitySet Name="ORGANIZATIONS_RMLS" EntityType="Self.ORGANIZATIONS_RMLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="PERMISSIONS" EntityType="Self.PERMISSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="PROCESS_PARAMETERS_TABLES" EntityType="Self.PROCESS_PARAMETERS_TABLES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="PROCESS_PARAMETERS_TABLES_GROUPS" EntityType="Self.PROCESS_PARAMETERS_TABLES_GROUPS" Schema="dbo" store:Type="Tables" />
@@ -2251,6 +2251,8 @@
           <EntitySet Name="ROLES" EntityType="Self.ROLES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="Self.ROLES_PERMISSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SEGMENTS" EntityType="Self.SEGMENTS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="SITES" EntityType="Self.SITES" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="SITES_RMLS" EntityType="Self.SITES_RMLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SPOOL_TYPES" EntityType="Self.SPOOL_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SPOOLS" EntityType="Self.SPOOLS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="SYNC_CONFIGURATIONS" EntityType="Self.SYNC_CONFIGURATIONS" Schema="dbo" store:Type="Tables" />
@@ -2645,13 +2647,11 @@
           <EntitySet Name="MACHINE_VERSIONS" EntityType="RemoteModel.MACHINE_VERSIONS" />
           <EntitySet Name="MACHINES" EntityType="RemoteModel.MACHINE" />
           <EntitySet Name="MACHINES_EVENTS" EntityType="RemoteModel.MACHINES_EVENTS" />
-          <EntitySet Name="MACHINES_RMLS" EntityType="RemoteModel.MACHINES_RMLS" />
           <EntitySet Name="MEDIA_CONDITIONS" EntityType="RemoteModel.MEDIA_CONDITIONS" />
           <EntitySet Name="MEDIA_MATERIALS" EntityType="RemoteModel.MEDIA_MATERIALS" />
           <EntitySet Name="MEDIA_PURPOSES" EntityType="RemoteModel.MEDIA_PURPOSES" />
           <EntitySet Name="MID_TANK_TYPES" EntityType="RemoteModel.MID_TANK_TYPES" />
           <EntitySet Name="ORGANIZATIONS" EntityType="RemoteModel.ORGANIZATION" />
-          <EntitySet Name="ORGANIZATIONS_RMLS" EntityType="RemoteModel.ORGANIZATIONS_RMLS" />
           <EntitySet Name="PERMISSIONS" EntityType="RemoteModel.PERMISSION" />
           <EntitySet Name="PROCESS_PARAMETERS_TABLES" EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" />
           <EntitySet Name="PROCESS_PARAMETERS_TABLES_GROUPS" EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" />
@@ -2659,6 +2659,8 @@
           <EntitySet Name="ROLES" EntityType="RemoteModel.ROLE" />
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="RemoteModel.ROLES_PERMISSIONS" />
           <EntitySet Name="SEGMENTS" EntityType="RemoteModel.SEGMENT" />
+          <EntitySet Name="SITES" EntityType="RemoteModel.SITE" />
+          <EntitySet Name="SITES_RMLS" EntityType="RemoteModel.SITES_RMLS" />
           <EntitySet Name="SPOOL_TYPES" EntityType="RemoteModel.SPOOL_TYPES" />
           <EntitySet Name="SPOOLS" EntityType="RemoteModel.SPOOL" />
           <EntitySet Name="sysdiagrams" EntityType="RemoteModel.sysdiagram" />
@@ -3808,6 +3810,7 @@
           <Property Name="NAME" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="PRODUCTION_DATE" Type="DateTime" Nullable="false" Precision="3" />
           <Property Name="ORGANIZATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="SITE_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="MACHINE_VERSION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="DEFAULT_RML_GUID" Type="String" MaxLength="36" FixedLength="false" Unicode="false" />
@@ -3862,16 +3865,6 @@
           <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_MACHINES_EVENTS_MACHINES" FromRole="MACHINES_EVENTS" ToRole="MACHINE" />
           <NavigationProperty Name="USER" Relationship="RemoteModel.FK_MACHINES_EVENTS_USERS" FromRole="MACHINES_EVENTS" ToRole="USER" />
         </EntityType>
-        <EntityType Name="MACHINES_RMLS">
-          <Key>
-            <PropertyRef Name="GUID" />
-          </Key>
-          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
-          <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-        </EntityType>
         <EntityType Name="MEDIA_CONDITIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -3933,16 +3926,6 @@
           <NavigationProperty Name="MACHINES" Relationship="RemoteModel.FK_MACHINES_ORGANIZATIONS" FromRole="ORGANIZATION" ToRole="MACHINE" />
           <NavigationProperty Name="USERS" Relationship="RemoteModel.FK_USERS_ORGANIZATIONS" FromRole="ORGANIZATION" ToRole="USER" />
         </EntityType>
-        <EntityType Name="ORGANIZATIONS_RMLS">
-          <Key>
-            <PropertyRef Name="GUID" />
-          </Key>
-          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
-          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
-          <Property Name="ORGANIZATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-          <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
-        </EntityType>
         <EntityType Name="PERMISSION">
           <Key>
             <PropertyRef Name="GUID" />
@@ -4086,6 +4069,27 @@
           <NavigationProperty Name="BRUSH_STOPS" Relationship="RemoteModel.FK_BRUSH_STOPS_SEGMENTS" FromRole="SEGMENT" ToRole="BRUSH_STOPS" />
           <NavigationProperty Name="JOB" Relationship="RemoteModel.FK_SEGMENTS_JOBS" FromRole="SEGMENT" ToRole="JOB" />
         </EntityType>
+        <EntityType Name="SITE">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="ORGANIZATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="DESCRIPTION" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
+        </EntityType>
+        <EntityType Name="SITES_RMLS">
+          <Key>
+            <PropertyRef Name="GUID" />
+          </Key>
+          <Property Name="ID" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" Precision="3" />
+          <Property Name="SITE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+        </EntityType>
         <EntityType Name="SPOOL_TYPES">
           <Key>
             <PropertyRef Name="GUID" />
@@ -6124,6 +6128,7 @@
                 <ScalarProperty Name="DEFAULT_RML_GUID" ColumnName="DEFAULT_RML_GUID" />
                 <ScalarProperty Name="CONFIGURATION_GUID" ColumnName="CONFIGURATION_GUID" />
                 <ScalarProperty Name="MACHINE_VERSION_GUID" ColumnName="MACHINE_VERSION_GUID" />
+                <ScalarProperty Name="SITE_GUID" ColumnName="SITE_GUID" />
                 <ScalarProperty Name="ORGANIZATION_GUID" ColumnName="ORGANIZATION_GUID" />
                 <ScalarProperty Name="PRODUCTION_DATE" ColumnName="PRODUCTION_DATE" />
                 <ScalarProperty Name="NAME" ColumnName="NAME" />
@@ -6150,17 +6155,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="MACHINES_RMLS">
-            <EntityTypeMapping TypeName="RemoteModel.MACHINES_RMLS">
-              <MappingFragment StoreEntitySet="MACHINES_RMLS">
-                <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
-                <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="MEDIA_CONDITIONS">
             <EntityTypeMapping TypeName="RemoteModel.MEDIA_CONDITIONS">
               <MappingFragment StoreEntitySet="MEDIA_CONDITIONS">
@@ -6218,17 +6212,6 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
-          <EntitySetMapping Name="ORGANIZATIONS_RMLS">
-            <EntityTypeMapping TypeName="RemoteModel.ORGANIZATIONS_RMLS">
-              <MappingFragment StoreEntitySet="ORGANIZATIONS_RMLS">
-                <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
-                <ScalarProperty Name="ORGANIZATION_GUID" ColumnName="ORGANIZATION_GUID" />
-                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
-                <ScalarProperty Name="GUID" ColumnName="GUID" />
-                <ScalarProperty Name="ID" ColumnName="ID" />
-              </MappingFragment>
-            </EntityTypeMapping>
-          </EntitySetMapping>
           <EntitySetMapping Name="PERMISSIONS">
             <EntityTypeMapping TypeName="RemoteModel.PERMISSION">
               <MappingFragment StoreEntitySet="PERMISSIONS">
@@ -6356,6 +6339,29 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="SITES">
+            <EntityTypeMapping TypeName="RemoteModel.SITE">
+              <MappingFragment StoreEntitySet="SITES">
+                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="ORGANIZATION_GUID" ColumnName="ORGANIZATION_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="SITES_RMLS">
+            <EntityTypeMapping TypeName="RemoteModel.SITES_RMLS">
+              <MappingFragment StoreEntitySet="SITES_RMLS">
+                <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
+                <ScalarProperty Name="SITE_GUID" ColumnName="SITE_GUID" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="SPOOL_TYPES">
             <EntityTypeMapping TypeName="RemoteModel.SPOOL_TYPES">
               <MappingFragment StoreEntitySet="SPOOL_TYPES">
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
index a30733407..e7b00e86f 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,82 +5,82 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="6.75" PointY="24.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="35.5" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="32.625" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="38.5" />
-        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="19" PointY="21.375" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="19.25" PointY="31.5" />
-        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="16.5" PointY="20.125" />
-        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="32.75" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="8" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="8.375" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="7.125" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="20" />
-        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="8.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="38.125" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="6.75" PointY="28.75" />
-        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="11.25" PointY="27.5" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="17" PointY="8.875" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="19.25" PointY="8.25" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="45.625" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="14.25" PointY="11.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="20.625" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="26.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="12.75" PointY="50" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="15" PointY="34.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="54" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="12" PointY="41.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="6.75" PointY="58" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="9" PointY="43.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.75" PointY="53.875" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="15" PointY="38.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="6.75" PointY="16" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="9" PointY="31" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="58" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12" PointY="45.625" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="41.375" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="9.75" PointY="50" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="12" PointY="37.75" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="19.25" PointY="13" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="21.5" PointY="21.25" />
-        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="0.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="13.5" PointY="16.75" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="14.25" PointY="2.5" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="20.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="13.5" PointY="30.625" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="12.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="17.125" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="16.5" PointY="14.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_RMLS" Width="1.5" PointX="2.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="16" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="29.75" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="24" />
-        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="19.25" PointY="34.5" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="9" PointY="26.625" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATIONS_RMLS" Width="1.5" PointX="2.75" PointY="3.75" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="15.25" PointY="52.625" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="50.625" />
-        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="52.25" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="17.125" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="15.25" PointY="48.5" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="17.5" PointY="48.625" />
-        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="24.375" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="4.625" />
-        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="19.5" PointY="17.125" />
-        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="4.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="11.75" PointY="6.75" />
-        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="16.5" PointY="28" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="6.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="8.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="10.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="13.75" PointY="6.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="2.75" PointY="12.75" />
-        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="16.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="11.25" PointY="30.625" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="17.5" PointY="37.625" />
-        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="11.25" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="6.75" PointY="38.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="6.75" PointY="13.5" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="10.625" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="6.75" PointY="7.625" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="19" PointY="22.5" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="14.25" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="16.5" PointY="21.375" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="14.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="44.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="44.625" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="43.375" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="21.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="48.125" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="9" PointY="10.375" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="6.75" PointY="34.75" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="11.25" PointY="28.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="12" PointY="38.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="14.25" PointY="38" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="14.25" PointY="12.875" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="21.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="34.25" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="6.75" PointY="50" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="9" PointY="16.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="52" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="12" PointY="10.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="19.75" PointY="32" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="22" PointY="16" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="16.75" PointY="2.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="19" PointY="7.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="19.75" PointY="4" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="22" PointY="8.125" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="9.75" PointY="3" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="12" PointY="6.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="6.75" PointY="16.5" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="6.75" PointY="1" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9" PointY="6.875" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="14.25" PointY="29.625" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="16.5" PointY="6.875" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="0.75" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="13.5" PointY="18" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="17.625" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="14.25" PointY="3.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="5.25" PointY="21.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="13.5" PointY="33.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="9" PointY="44.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="11.25" PointY="18.25" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="16.5" PointY="16.125" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="28.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="31.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="25.5" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="14.25" PointY="8.625" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="9" PointY="36.75" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="14.25" PointY="46.875" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="27.5" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="29.125" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="18.375" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="14.25" PointY="42.75" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.5" PointY="42.875" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="25.5" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="2.75" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="2.75" PointY="4.875" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="40.625" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="19.5" PointY="18.375" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="0.75" PointY="7.875" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="2.75" PointY="7.875" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="16.5" PointY="37.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="2.75" PointY="11.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="21.75" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="21.75" PointY="4.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="21.75" PointY="21.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="23.75" PointY="1.875" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="23.75" PointY="21.875" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="11.25" PointY="31.75" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="16.5" PointY="32.875" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="11.25" PointY="14.5" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATIONS_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs
index 1db95419e..10dcaef11 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/ORGANIZATIONS_RMLS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITE.cs
@@ -12,12 +12,13 @@ namespace Tango.DAL.Remote.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class ORGANIZATIONS_RMLS
+    public partial class SITE
     {
         public int ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public string ORGANIZATION_GUID { get; set; }
-        public string RML_GUID { get; set; }
+        public string NAME { get; set; }
+        public string DESCRIPTION { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_RMLS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_RMLS.cs
index 64cdfe830..ea22adbf8 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINES_RMLS.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_RMLS.cs
@@ -12,12 +12,12 @@ namespace Tango.DAL.Remote.DB
     using System;
     using System.Collections.Generic;
     
-    public partial class MACHINES_RMLS
+    public partial class SITES_RMLS
     {
         public int ID { get; set; }
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
-        public string MACHINE_GUID { get; set; }
+        public string SITE_GUID { get; set; }
         public string RML_GUID { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
index cda3f47c2..4150c2771 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -204,9 +204,6 @@
     <Compile Include="DB\MACHINES_EVENTS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\MACHINES_RMLS.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\MACHINE_STUDIO_VERSIONS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -228,9 +225,6 @@
     <Compile Include="DB\ORGANIZATION.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-    <Compile Include="DB\ORGANIZATIONS_RMLS.cs">
-      <DependentUpon>RemoteADO.tt</DependentUpon>
-    </Compile>
     <Compile Include="DB\PERMISSION.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
@@ -267,6 +261,12 @@
     <Compile Include="DB\SEGMENT.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\SITE.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\SITES_RMLS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\SPOOL.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln
index 9d0bc3083..bfdbb9c8a 100644
--- a/Software/Visual_Studio/Tango.sln
+++ b/Software/Visual_Studio/Tango.sln
@@ -331,6 +331,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Browser", "PPC\Mo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Packages.CefInstaller", "PPC\Packages\Tango.PPC.Packages.CefInstaller\Tango.PPC.Packages.CefInstaller.csproj", "{DF64460A-6617-4338-872A-DC43FD994C48}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.MachineStudio.Sites", "MachineStudio\Modules\Tango.MachineStudio.Sites\Tango.MachineStudio.Sites.csproj", "{18A27902-9881-4556-8163-F6DF2236A14D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		AppVeyor|Any CPU = AppVeyor|Any CPU
@@ -5903,6 +5905,46 @@ Global
 		{DF64460A-6617-4338-872A-DC43FD994C48}.Release|x64.Build.0 = Release|Any CPU
 		{DF64460A-6617-4338-872A-DC43FD994C48}.Release|x86.ActiveCfg = Release|Any CPU
 		{DF64460A-6617-4338-872A-DC43FD994C48}.Release|x86.Build.0 = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|Any CPU.ActiveCfg = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|Any CPU.Build.0 = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|ARM.ActiveCfg = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|ARM.Build.0 = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|ARM64.ActiveCfg = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|ARM64.Build.0 = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|x64.ActiveCfg = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|x64.Build.0 = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|x86.ActiveCfg = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.AppVeyor|x86.Build.0 = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Debug|ARM.Build.0 = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Debug|x64.Build.0 = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Debug|x86.Build.0 = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|Any CPU.ActiveCfg = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|Any CPU.Build.0 = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|ARM.ActiveCfg = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|ARM.Build.0 = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|ARM64.ActiveCfg = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|ARM64.Build.0 = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|x64.ActiveCfg = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|x64.Build.0 = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|x86.ActiveCfg = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.DefaultBuild|x86.Build.0 = Debug|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Release|ARM.Build.0 = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Release|ARM64.Build.0 = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Release|x64.ActiveCfg = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Release|x64.Build.0 = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Release|x86.ActiveCfg = Release|Any CPU
+		{18A27902-9881-4556-8163-F6DF2236A14D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -6013,6 +6055,7 @@ Global
 		{F3746F2B-E4AE-498B-9D42-74F95D992460} = {C81ED1A3-D18C-4D80-A8F5-061994A14A60}
 		{F02EAA84-AD59-465B-99A2-4422C13BFB72} = {0048447D-1D94-4E60-9DAD-7349C777CB4E}
 		{DF64460A-6617-4338-872A-DC43FD994C48} = {E728CBD9-1AF4-4814-A218-E4BD26E7EDEA}
+		{18A27902-9881-4556-8163-F6DF2236A14D} = {B2AF4F3F-2828-47C3-8F3E-A0EA0BD66FF8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6}