Implemented sites module on MS.

Implemented site selection on Machine Designer.

17 files changed, 780 insertions, 6 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 768f93de1..fd31cd950 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -115,6 +115,21 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             set { _selectedSpool = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
         }
 
+        private Site _selectedSite;
+        public Site SelectedSite
+        {
+            get { return _selectedSite; }
+            set { _selectedSite = value; RaisePropertyChangedAuto(); }
+        }
+
+        private List<Site> _sites;
+        public List<Site> Sites
+        {
+            get { return _sites; }
+            set { _sites = value; RaisePropertyChangedAuto(); }
+        }
+
+
         private ColorCalibrationViewVM _colorCalibrationViewVM;
         public ColorCalibrationViewVM ColorCalibrationViewVM
         {
@@ -474,6 +489,10 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                         }
                     }
 
+                    Sites = await ActiveMachineAdapter.Context.Sites.ToListAsync();
+                    Sites.Insert(0, new Site() { Name = "NONE", ID = -1 });
+                    SelectedSite = Sites.SingleOrDefault(x => x.Guid == ActiveMachine.SiteGuid);
+
                     ColorCalibrationViewVM = new ColorCalibrationViewVM(_notification, ActiveMachine, _activeMachineAdapter.Context)
                     {
                         Rmls = ActiveMachineAdapter.Rmls,
@@ -487,7 +506,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     await MachineUpdatesViewVM.Init(ActiveMachine, ActiveMachineAdapter.Context);
                     TupViewVM.Init(ActiveMachine);
 
-
                     ActiveMachine.Configuration.HardwareVersionChanged += Configuration_HardwareVersionChanged;
 
                     View.NavigateTo(MachineDesignerNavigationView.MachineDetailsView);
@@ -651,6 +669,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     ActiveMachine.ConfigurationGuid = ActiveMachine.Configuration.Guid;
                     ActiveMachine.LastUpdated = DateTime.UtcNow;
                     ActiveMachine.ProductionDate = DateTime.UtcNow;
+                    ActiveMachine.SiteGuid = SelectedSite == null ? null : (SelectedSite.ID == -1 ? null : SelectedSite.Guid);
 
                     ColorCalibrationViewVM.Save();
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
index b6c1ba974..0a0c1ecef 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Views/MachineSettingsView.xaml
@@ -48,6 +48,9 @@
                                 <TextBlock FontWeight="SemiBold">Organization</TextBlock>
                                 <ComboBox Background="Transparent" ItemsSource="{Binding ActiveMachineAdapter.Organizations}" SelectedItem="{Binding ActiveMachine.Organization}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
 
+                                <TextBlock FontWeight="SemiBold">Site</TextBlock>
+                                <ComboBox Background="Transparent" ItemsSource="{Binding Sites}" SelectedItem="{Binding SelectedSite}" DisplayMemberPath="Name" Style="{StaticResource TransparentComboBoxStyle}"></ComboBox>
+
                                 <TextBlock FontWeight="SemiBold">OS Key</TextBlock>
                                 <TextBox Text="{Binding ActiveMachine.OsKey}"></TextBox>
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/App.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/App.xaml
new file mode 100644
index 000000000..01a064b05
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/App.xaml
@@ -0,0 +1,12 @@
+<Application x:Class="Tango.MachineStudio.Sites.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Resources/MaterialDesign.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/Tango.MachineStudio.Common;component/Themes/LightThemeColors.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Contracts/IMainView.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Contracts/IMainView.cs
new file mode 100644
index 000000000..67f57b28c
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Contracts/IMainView.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.Sites.Contracts
+{
+    public enum SitesNavigationView
+    {
+        SitesView,
+        SiteDetailsView,
+    }
+
+    public interface IMainView : IView
+    {
+        void NavigateTo(SitesNavigationView view);
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Images/machine_site.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Images/machine_site.png
new file mode 100644
index 000000000..9b22e53b0
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Images/machine_site.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Models/SiteModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Models/SiteModel.cs
new file mode 100644
index 000000000..007f8a3ad
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Models/SiteModel.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using Tango.SharedUI.Components;
+
+namespace Tango.MachineStudio.Sites.Models
+{
+    public class SiteModel : Site
+    {
+        public String Organization { get; set; }
+        public int MachineCount { get; set; }
+        public int CatalogCount { get; set; }
+        public int ThreadCount { get; set; }
+    }
+}
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
index 95f71baa8..ea9162ce2 100644
--- 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
@@ -32,6 +32,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
     <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>
@@ -48,6 +54,7 @@
       <HintPath>..\..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <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>
@@ -66,8 +73,11 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Contracts\IMainView.cs" />
+    <Compile Include="Models\SiteModel.cs" />
     <Compile Include="ViewModelLocator.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
+    <Compile Include="ViewModels\SiteDetailsViewVM.cs" />
     <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
@@ -75,10 +85,28 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="SitesModule.cs" />
+    <Compile Include="Views\SiteDetailsView.xaml.cs">
+      <DependentUpon>SiteDetailsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SitesView.xaml.cs">
+      <DependentUpon>SitesView.xaml</DependentUpon>
+    </Compile>
+    <Page Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\MainView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\SiteDetailsView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\SitesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
@@ -105,7 +133,9 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Images\machine_site.png" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
       <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
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
index d0be162dd..486c8b46f 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/MainViewVM.cs
@@ -4,15 +4,209 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL;
+using Tango.BL.Entities;
+using Tango.Core.Commands;
+using Tango.Core.Threading;
 using Tango.MachineStudio.Common;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.MachineStudio.Sites.Contracts;
+using Tango.MachineStudio.Sites.Models;
 
 namespace Tango.MachineStudio.Sites.ViewModels
 {
-    public class MainViewVM : StudioViewModel
+    public class MainViewVM : StudioViewModel<IMainView>
     {
+        private ObservablesContext _db;
+        private INotificationProvider _notification;
+        private ActionTimer _filter_timer;
+
+        private List<SiteModel> _sites;
+        public List<SiteModel> Sites
+        {
+            get { return _sites; }
+            set { _sites = value; RaisePropertyChangedAuto(); }
+        }
+
+        private SiteModel _selectedSite;
+        public SiteModel SelectedSite
+        {
+            get { return _selectedSite; }
+            set { _selectedSite = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
+        private String _filter;
+        public String Filter
+        {
+            get { return _filter; }
+            set { _filter = value; RaisePropertyChangedAuto(); OnFilterChanged(); }
+        }
+
+        private SiteDetailsViewVM _siteDetailsViewVM;
+        public SiteDetailsViewVM SiteDetailsViewVM
+        {
+            get { return _siteDetailsViewVM; }
+            set { _siteDetailsViewVM = value; RaisePropertyChangedAuto(); }
+        }
+
+        public RelayCommand AddSiteCommand { get; set; }
+
+        public RelayCommand RemoveSiteCommand { get; set; }
+
+        public RelayCommand ManageSiteCommand { get; set; }
+
+        public RelayCommand BackToSitesCommand { get; set; }
+
+        public MainViewVM(INotificationProvider notificationProvider)
+        {
+            _notification = notificationProvider;
+            _filter_timer = new ActionTimer(TimeSpan.FromMilliseconds(500));
+
+            ManageSiteCommand = new RelayCommand(() => LoadSelectedSite(), () => SelectedSite != null);
+            BackToSitesCommand = new RelayCommand(() => { View.NavigateTo(SitesNavigationView.SitesView); });
+            AddSiteCommand = new RelayCommand(AddNewSite);
+            RemoveSiteCommand = new RelayCommand(RemoveSelectedSite, () => SelectedSite != null);
+        }
+
+        private async void RemoveSelectedSite()
+        {
+            if (!_notification.ShowQuestion("Are you sure you wish to remove the selected site?")) return;
+
+            try
+            {
+                using (_notification.PushTaskItem("Removing site..."))
+                {
+                    IsFree = false;
+                    await Task.Factory.StartNew(() =>
+                    {
+                        var site = _db.Sites.SingleOrDefault(x => x.Guid == SelectedSite.Guid);
+                        site.Delete(_db);
+                        _db.SaveChanges();
+                        Sites.Remove(SelectedSite);
+                        LoadSites();
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error removing site.");
+                _notification.ShowError($"Error removing site.\n{ex.FlattenMessage()}");
+            }
+            finally
+            {
+                IsFree = true;
+            }
+        }
+
+        private async void AddNewSite()
+        {
+            try
+            {
+                String name = _notification.ShowTextInput("Enter site name", "name");
+                if (String.IsNullOrWhiteSpace(name)) return;
+
+                using (_notification.PushTaskItem("Creating site..."))
+                {
+                    IsFree = false;
+                    SiteDetailsViewVM = new SiteDetailsViewVM();
+                    SiteDetailsViewVM.Saved += SiteDetailsViewVM_Saved;
+                    await SiteDetailsViewVM.Init(SelectedSite?.Guid, _notification, true, name);
+                    View.NavigateTo(SitesNavigationView.SiteDetailsView);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error creating site.");
+                _notification.ShowError($"Error creating site.\n{ex.FlattenMessage()}");
+            }
+            finally
+            {
+                IsFree = true;
+            }
+        }
+
+        private async void LoadSelectedSite()
+        {
+            try
+            {
+                using (_notification.PushTaskItem("Loading site details..."))
+                {
+                    IsFree = false;
+                    SiteDetailsViewVM = new SiteDetailsViewVM();
+                    SiteDetailsViewVM.Saved += SiteDetailsViewVM_Saved;
+                    await SiteDetailsViewVM.Init(SelectedSite.Guid, _notification, false);
+                    View.NavigateTo(SitesNavigationView.SiteDetailsView);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error loading site details.");
+                _notification.ShowError($"Error loading site details.\n{ex.FlattenMessage()}");
+            }
+            finally
+            {
+                IsFree = true;
+            }
+        }
+
+        private void SiteDetailsViewVM_Saved(object sender, EventArgs e)
+        {
+            OnFilterChanged();
+            View.NavigateTo(SitesNavigationView.SitesView);
+        }
+
+        private void OnFilterChanged()
+        {
+            if (Filter != null)
+            {
+                _filter_timer.ResetReplace(() =>
+                {
+                    try
+                    {
+                        LoadSites();
+                    }
+                    catch (Exception ex)
+                    {
+                        LogManager.Log(ex, "Error loading sites list.");
+                    }
+                });
+            }
+        }
+
+        private void LoadSites()
+        {
+            using (_notification.PushTaskItem("Loading sites..."))
+            {
+                Sites = (from site in _db.Sites
+                         join organization in _db.Organizations on site.OrganizationGuid equals organization.Guid
+                         join sites_rmls in _db.SitesRmls on site.Guid equals sites_rmls.SiteGuid into rmls
+                         join sites_catalogs in _db.SitesCatalogs on site.Guid equals sites_catalogs.SiteGuid into catalogs
+                         join sites_machines in _db.Machines on site.Guid equals sites_machines.SiteGuid into machines
+                         where Filter == null || Filter == "" || site.Name.ToLower().StartsWith(Filter.ToLower()) || organization.Name.ToLower().StartsWith(Filter.ToLower())
+                         select new
+                         {
+                             Site = site,
+                             OrganizationName = organization.Name,
+                             ThreadCount = rmls.Count(x => x.SiteGuid == site.Guid),
+                             CatalogCount = catalogs.Count(x => x.SiteGuid == site.Guid),
+                             MachineCount = machines.Count(x => x.SiteGuid == site.Guid)
+                         }).Distinct().ToList().DistinctBy(x => x.Site.Guid).Select(x => new SiteModel()
+                         {
+                             Guid = x.Site.Guid,
+                             ID = x.Site.ID,
+                             Name = x.Site.Name,
+                             Description = x.Site.Description,
+                             ThreadCount = x.ThreadCount,
+                             CatalogCount = x.CatalogCount,
+                             MachineCount = x.MachineCount,
+                             Organization = x.OrganizationName,
+                         }).ToList();
+            }
+        }
+
         public override void OnApplicationReady()
         {
-            
+            _db = ObservablesContext.CreateDefault();
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/SiteDetailsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/SiteDetailsViewVM.cs
new file mode 100644
index 000000000..0e4dcbb47
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/ViewModels/SiteDetailsViewVM.cs
@@ -0,0 +1,153 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL;
+using Tango.BL.Entities;
+using Tango.Core.Commands;
+using Tango.SharedUI;
+using Tango.SharedUI.Components;
+using System.Data.Entity;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.Sites.ViewModels
+{
+    public class SiteDetailsViewVM : ViewModel
+    {
+        private ObservablesContext _db;
+        private INotificationProvider _notification;
+
+        public event EventHandler Saved;
+
+        private Site _site;
+        public Site Site
+        {
+            get { return _site; }
+            set { _site = value; RaisePropertyChangedAuto(); }
+        }
+
+        private List<Organization> _organizations;
+        public List<Organization> Organizations
+        {
+            get { return _organizations; }
+            set { _organizations = value; RaisePropertyChangedAuto(); }
+        }
+
+        private Organization _selectedOrganization;
+        public Organization SelectedOrganization
+        {
+            get { return _selectedOrganization; }
+            set { _selectedOrganization = value; RaisePropertyChangedAuto(); }
+        }
+
+        private SelectedObjectCollection<Rml> _rmls;
+        public SelectedObjectCollection<Rml> Rmls
+        {
+            get { return _rmls; }
+            set { _rmls = value; RaisePropertyChangedAuto(); }
+        }
+
+        private SelectedObjectCollection<ColorCatalog> _catalogs;
+        public SelectedObjectCollection<ColorCatalog> Catalogs
+        {
+            get { return _catalogs; }
+            set { _catalogs = value; RaisePropertyChangedAuto(); }
+        }
+
+        private List<Machine> _machines;
+        public List<Machine> Machines
+        {
+            get { return _machines; }
+            set { _machines = value; RaisePropertyChangedAuto(); }
+        }
+
+        public RelayCommand SaveCommand { get; set; }
+
+        public SiteDetailsViewVM()
+        {
+            SaveCommand = new RelayCommand(Save, () => IsFree);
+        }
+
+        public async Task Init(String siteGuid, INotificationProvider notification, bool isNew, string newSiteName = null)
+        {
+            _notification = notification;
+
+            _db = ObservablesContext.CreateDefault();
+            Organizations = await _db.Organizations.ToListAsync();
+
+            if (isNew)
+            {
+                Site = new Site();
+                Site.Name = newSiteName;
+                Site.Description = "My site description";
+                _db.Sites.Add(Site);
+            }
+            else
+            {
+                Site = await _db.Sites.SingleOrDefaultAsync(x => x.Guid == siteGuid);
+            }
+
+            Machines = await _db.Machines.Where(x => x.SiteGuid == Site.Guid).Include(x => x.Organization).ToListAsync();
+
+            var site_rmls = await _db.SitesRmls.Where(x => x.SiteGuid == Site.Guid).ToListAsync();
+            var site_catalogs = await _db.SitesCatalogs.Where(x => x.SiteGuid == Site.Guid).ToListAsync();
+
+            var rmls = await _db.Rmls.OrderBy(x => x.Name).ToListAsync();
+            var catalogs = await _db.ColorCatalogs.OrderBy(x => x.Name).ToListAsync();
+
+            Rmls = new SelectedObjectCollection<Rml>(rmls.ToObservableCollection(), rmls.Where(rml => site_rmls.Exists(siteRml => siteRml.RmlGuid == rml.Guid)).ToObservableCollection());
+            Catalogs = new SelectedObjectCollection<ColorCatalog>(catalogs.ToObservableCollection(), catalogs.Where(catalog => site_catalogs.Exists(siteCatalog => siteCatalog.CatalogGuid == catalog.Guid)).ToObservableCollection());
+
+            SelectedOrganization = Organizations.SingleOrDefault(x => x.Guid == Site.OrganizationGuid);
+        }
+
+        private async void Save()
+        {
+            try
+            {
+                Site.OrganizationGuid = SelectedOrganization?.Guid;
+
+                if (!Site.Validate(_db))
+                {
+                    _notification.ShowError(String.Join("\n", Site.ValidationErrors));
+                    return;
+                }
+
+                IsFree = false;
+
+                using (_notification.PushTaskItem("Saving site details..."))
+                {
+                    var site_rmls = await _db.SitesRmls.Where(x => x.SiteGuid == Site.Guid).ToListAsync();
+                    var site_catalogs = await _db.SitesCatalogs.Where(x => x.SiteGuid == Site.Guid).ToListAsync();
+
+                    _db.SitesRmls.RemoveRange(site_rmls);
+                    _db.SitesCatalogs.RemoveRange(site_catalogs);
+
+                    foreach (var selectedRml in Rmls.SynchedSource)
+                    {
+                        _db.SitesRmls.Add(new SitesRml() { SiteGuid = Site.Guid, RmlGuid = selectedRml.Guid });
+                    }
+
+                    foreach (var selectedCatalog in Catalogs.SynchedSource)
+                    {
+                        _db.SitesCatalogs.Add(new SitesCatalog() { SiteGuid = Site.Guid, CatalogGuid = selectedCatalog.Guid });
+                    }
+
+                    await _db.SaveChangesAsync();
+                }
+                _db.Dispose();
+                Saved?.Invoke(this, new EventArgs());
+            }
+            catch (Exception ex)
+            {
+                LogManager.Log(ex, "Error saving site details.");
+                _notification.ShowError($"Error saving site details.\n{ex.FlattenMessage()}");
+            }
+            finally
+            {
+                IsFree = true;
+            }
+        }
+    }
+}
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
index 80f9ae151..4ca82c4f7 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/MainView.xaml
@@ -7,9 +7,13 @@
              xmlns:vm="clr-namespace:Tango.MachineStudio.Sites.ViewModels"
              xmlns:global="clr-namespace:Tango.MachineStudio.Sites"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              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>
+        <controls:NavigationControl x:Name="navigationControl" TransitionType="Slide">
+            <local:SitesView />
+            <local:SiteDetailsView/>
+        </controls:NavigationControl>
     </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
index 75ced5ae2..c4f9995ce 100644
--- 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
@@ -12,17 +12,25 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Tango.Core.DI;
+using Tango.MachineStudio.Sites.Contracts;
 
 namespace Tango.MachineStudio.Sites.Views
 {
     /// <summary>
     /// Interaction logic for MainView.xaml
     /// </summary>
-    public partial class MainView : UserControl
+    public partial class MainView : UserControl, IMainView
     {
         public MainView()
         {
             InitializeComponent();
+            TangoIOC.Default.Register<IMainView>(this);
+        }
+
+        public void NavigateTo(SitesNavigationView view)
+        {
+            navigationControl.NavigateTo(view.ToString());
         }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SiteDetailsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SiteDetailsView.xaml
new file mode 100644
index 000000000..b3496a5e2
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SiteDetailsView.xaml
@@ -0,0 +1,170 @@
+<UserControl x:Class="Tango.MachineStudio.Sites.Views.SiteDetailsView"
+             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"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             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}">
+
+    <UserControl.Resources>
+        <Style x:Key="GridStyle" TargetType="DataGrid" BasedOn="{StaticResource {x:Type DataGrid}}">
+            <Setter Property="AutoGenerateColumns" Value="False"></Setter>
+            <Setter Property="SelectionMode" Value="Single"></Setter>
+            <Setter Property="SelectionUnit" Value="FullRow"></Setter>
+            <Setter Property="IsReadOnly" Value="True"></Setter>
+        </Style>
+
+        <Style x:Key="CellStyle" TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type DataGridCell}">
+                        <Grid Background="{TemplateBinding Background}">
+                            <ContentPresenter VerticalAlignment="Center" Margin="8" />
+                        </Grid>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+            <Setter Property="BorderThickness" Value="0"/>
+            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+            <Style.Triggers>
+                <Trigger Property="IsSelected" Value="True">
+                    <Setter Property="BorderThickness" Value="0"/>
+                    <Setter Property="BorderBrush" Value="Cyan"/>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+    </UserControl.Resources>
+
+    <Grid Margin="20" DataContext="{Binding SiteDetailsViewVM}" d:DataContext="{d:DesignInstance Type=vm:SiteDetailsViewVM, IsDesignTimeCreatable=False}">
+        <DockPanel>
+            <Grid DockPanel.Dock="Top">
+                <StackPanel Orientation="Horizontal">
+                    <Button Style="{StaticResource MaterialDesignFlatButton}" Height="Auto" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.BackToSitesCommand}">
+                        <materialDesign:PackIcon Kind="ArrowLeft" Width="50" Height="50" Foreground="#202020" ToolTip="Back to RML list" />
+                    </Button>
+                    <TextBlock Text="{Binding Site.Name,NotifyOnValidationError=False,ValidatesOnNotifyDataErrors=False}" VerticalAlignment="Center" Margin="10 0 0 0" FontSize="34"></TextBlock>
+                </StackPanel>
+
+                <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                    <Button Margin="10 0 0 0" Width="170" Height="45" VerticalAlignment="Center" Command="{Binding SaveCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="ContentSaveAll" Width="24" Height="24" />
+                            <TextBlock VerticalAlignment="Center" Margin="10 0 0 0">SAVE</TextBlock>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+            </Grid>
+
+            <Grid Margin="0 20">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="113*"/>
+                    <RowDefinition Height="358*"/>
+                </Grid.RowDefinitions>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="302*"/>
+                        <ColumnDefinition Width="399*"/>
+                        <ColumnDefinition Width="1179*"/>
+                    </Grid.ColumnDefinitions>
+
+                    <Grid Margin="10">
+                        <materialDesign:Card Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
+                            <Border Padding="20">
+                                <DockPanel>
+                                    <TextBlock DockPanel.Dock="Top" FontSize="16">PROPERTIES</TextBlock>
+                                    <controls:TableGrid RowHeight="35">
+                                        <TextBlock Text="Name:" ></TextBlock>
+                                        <TextBox Text="{Binding Site.Name,UpdateSourceTrigger=PropertyChanged,ValidatesOnDataErrors=True,ValidatesOnNotifyDataErrors=True}"></TextBox>
+
+                                        <TextBlock Text="Organization:" ></TextBlock>
+                                        <ComboBox ItemsSource="{Binding Organizations}" SelectedItem="{Binding SelectedOrganization}" DisplayMemberPath="Name"></ComboBox>
+
+                                        <TextBlock Text="Description:" ></TextBlock>
+                                        <TextBox Text="{Binding Site.Description,UpdateSourceTrigger=PropertyChanged,ValidatesOnDataErrors=True,ValidatesOnNotifyDataErrors=True}"></TextBox>
+                                    </controls:TableGrid>
+                                </DockPanel>
+                            </Border>
+                        </materialDesign:Card>
+                    </Grid>
+
+                    <Grid Grid.Column="1" Margin="10">
+
+                    </Grid>
+
+                    <Grid Grid.ColumnSpan="3">
+
+                    </Grid>
+                </Grid>
+
+                <Grid Grid.Row="1" Margin="0 20 0 0">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                            <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+
+
+                        <DockPanel Margin="10">
+                            <TextBlock DockPanel.Dock="Top" FontSize="16">SITE RML</TextBlock>
+
+                            <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
+                                <DataGrid ItemsSource="{Binding Rmls}" Style="{StaticResource GridStyle}" CellStyle="{StaticResource CellStyle}">
+                                    <DataGrid.Columns>
+                                        <DataGridTemplateColumn Header="" Width="Auto">
+                                            <DataGridTemplateColumn.CellTemplate>
+                                                <DataTemplate>
+                                                    <CheckBox IsChecked="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
+                                                </DataTemplate>
+                                            </DataGridTemplateColumn.CellTemplate>
+                                        </DataGridTemplateColumn>
+                                        <DataGridTextColumn Header="NAME" IsReadOnly="True" Binding="{Binding Data.Name}" Width="1*" />
+                                    </DataGrid.Columns>
+                                </DataGrid>
+                            </materialDesign:Card>
+                        </DockPanel>
+
+
+                        <DockPanel Margin="10" Grid.Column="1">
+                            <TextBlock DockPanel.Dock="Top" FontSize="16" Text="SITE CATALOGS"/>
+                            <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
+                                <DataGrid ItemsSource="{Binding Catalogs}" Style="{StaticResource GridStyle}" CellStyle="{StaticResource CellStyle}">
+                                    <DataGrid.Columns>
+                                        <DataGridTemplateColumn Header="" Width="Auto">
+                                            <DataGridTemplateColumn.CellTemplate>
+                                                <DataTemplate>
+                                                    <CheckBox IsChecked="{Binding IsSelected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" />
+                                                </DataTemplate>
+                                            </DataGridTemplateColumn.CellTemplate>
+                                        </DataGridTemplateColumn>
+                                        <DataGridTextColumn Header="NAME" Binding="{Binding Data.Name}" Width="1*" />
+                                    </DataGrid.Columns>
+                                </DataGrid>
+                            </materialDesign:Card>
+                        </DockPanel>
+
+                        <DockPanel Margin="10" Grid.Column="2">
+                            <TextBlock DockPanel.Dock="Top" FontSize="16" Text="SITE MACHINES"/>
+                            <materialDesign:Card Margin="0 5 0 0" Background="{DynamicResource MaterialDesignBackground}" VerticalAlignment="Stretch">
+                                <DataGrid ItemsSource="{Binding Machines}" Style="{StaticResource GridStyle}" CellStyle="{StaticResource CellStyle}">
+                                    <DataGrid.Columns>
+                                        <DataGridTextColumn Header="ORGANIZATION" Binding="{Binding Organization.Name}" Width="Auto" />
+                                        <DataGridTextColumn Header="SERIAL NUMBER" Binding="{Binding SerialNumber}" Width="Auto" />
+                                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="1*" />
+                                    </DataGrid.Columns>
+                                </DataGrid>
+                            </materialDesign:Card>
+                        </DockPanel>
+                    </Grid>
+                </Grid>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SiteDetailsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SiteDetailsView.xaml.cs
new file mode 100644
index 000000000..03e9a2f75
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SiteDetailsView.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 SiteDetailsView.xaml
+    /// </summary>
+    public partial class SiteDetailsView : UserControl
+    {
+        public SiteDetailsView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SitesView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SitesView.xaml
new file mode 100644
index 000000000..437003a8a
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SitesView.xaml
@@ -0,0 +1,76 @@
+<UserControl x:Class="Tango.MachineStudio.Sites.Views.SitesView"
+             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"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             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}">
+    <UserControl.Resources>
+        <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
+    </UserControl.Resources>
+
+    <Grid>
+        <DockPanel Margin="100" MaxWidth="1200">
+            <Grid DockPanel.Dock="Top">
+                <StackPanel Orientation="Horizontal">
+                    <Image  Source="../Images/machine_site.png" Width="350" RenderOptions.BitmapScalingMode="Fant" Margin="10" />
+
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Bottom" Margin="0 0 0 10">
+                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="Magnify" Width="32" Height="32" />
+                        <TextBox Width="400" FontSize="20" Margin="10 0 0 0" materialDesign:HintAssist.Hint="Name, Organization" Text="{Binding Filter,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"></TextBox>
+                    </StackPanel>
+                </StackPanel>
+            </Grid>
+            <Grid DockPanel.Dock="Bottom" IsEnabled="{Binding IsFree}">
+                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource RedBrush300}" BorderBrush="{StaticResource RedBrush300}" Command="{Binding RemoveSiteCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
+                            <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
+                        </StackPanel>
+                    </Button>
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="{StaticResource GreenBrush300}" BorderBrush="{StaticResource GreenBrush300}" Command="{Binding AddSiteCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
+                            <TextBlock Margin="5 0 0 0" FontSize="16">NEW SITE</TextBlock>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Margin="50 0 0 0" MinWidth="200" Height="60" Command="{Binding ManageSiteCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Pencil" Width="24" Height="24" />
+                            <TextBlock Margin="10 0 0 0" FontSize="18">EDIT</TextBlock>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+            </Grid>
+            <Grid IsEnabled="{Binding IsFree}">
+                <controls:DoubleClickDataGrid Style="{StaticResource {x:Type DataGrid}}" DoubleClickCommand="{Binding ManageSiteCommand}" Margin="0 0 0 10" BorderBrush="{StaticResource borderBrush}" IsReadOnly="True" BorderThickness="1" Background="{StaticResource TransparentBackgroundBrush}" AlternatingRowBackground="{StaticResource Transparent200}" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Sites}" SelectedItem="{Binding SelectedSite}">
+                    <DataGrid.CellStyle>
+                        <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                            <Setter Property="BorderThickness" Value="0"/>
+                            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                        </Style>
+                    </DataGrid.CellStyle>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="Auto" />
+                        <DataGridTextColumn Header="DESCRIPTION" Binding="{Binding Description}" Width="Auto" />
+                        <DataGridTextColumn Header="ORGANIZATION" Binding="{Binding Organization}" Width="Auto" />
+                        <DataGridTextColumn Header="MACHINES" Binding="{Binding MachineCount}" Width="Auto" />
+                        <DataGridTextColumn Header="THREADS" Binding="{Binding ThreadCount}" Width="Auto" />
+                        <DataGridTextColumn Header="CATALOGS" Binding="{Binding CatalogCount}" Width="Auto" />
+                        <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" />
+                    </DataGrid.Columns>
+                </controls:DoubleClickDataGrid>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SitesView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SitesView.xaml.cs
new file mode 100644
index 000000000..e6a4a6fe6
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/Views/SitesView.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 SitesView.xaml
+    /// </summary>
+    public partial class SitesView : UserControl
+    {
+        public SitesView()
+        {
+            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
index 97a204217..7b82e5f7c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/app.config
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/app.config
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -72,4 +76,10 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
+  <entityFramework>
+    <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+    </providers>
+  </entityFramework>
 </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
index fd88f4804..e57143046 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/packages.config
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Sites/packages.config
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
   <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" />