Implemented site catalogs !

27 files changed, 486 insertions, 99 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
index 3cc4406d6..4d88a71d9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Catalogs/ViewModels/MainViewVM.cs
@@ -197,7 +197,7 @@ namespace Tango.MachineStudio.Catalogs.ViewModels
 
                         _activeCatalogContext = ObservablesContext.CreateDefault();
 
-                        ActiveCatalog = await new ColorCatalogBuilder(_activeCatalogContext).Set(SelectedCatalog.Guid).WithGroups().WithItems().WithRecipes().BuildAsync();
+                        ActiveCatalog = await new CatalogBuilder(_activeCatalogContext).Set(SelectedCatalog.Guid).WithGroups().WithItems().WithRecipes().BuildAsync();
                         SelectedGroup = ActiveCatalog.ColorCatalogsGroups.FirstOrDefault();
                         RMLS = await _activeCatalogContext.Rmls.ToListAsync();
 
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index dac8f9e49..0a5167900 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -468,7 +468,7 @@ namespace Tango.PPC.Jobs.ViewModels
                     Job.ValidateOnPropertyChanged = true;
 
                     LogManager.Log("Loading RMLS...");
-                    Rmls = (await new RmlsCollectionBuilder(_db).SetAll().WithActiveParametersGroup().WithCAT(Job.MachineGuid).WithCCT().WithLiquidFactors().BuildAsync()).ToList();
+                    Rmls = (await new RmlsCollectionBuilder(_db).SetAll().WithActiveParametersGroup().WithCAT(Job.MachineGuid).WithCCT().WithLiquidFactors().WithSite(MachineProvider.Machine.SiteGuid).BuildAsync()).ToList();
                     LogManager.Log("Loading Color Spaces...");
                     ColorSpaces = await _db.ColorSpaces.ToListAsync();
                     LogManager.Log("Loading Spool Types...");
@@ -478,7 +478,7 @@ namespace Tango.PPC.Jobs.ViewModels
 
                     if (Job.ColorSpace.Space == BL.Enumerations.ColorSpaces.Catalog)
                     {
-                        SelectedCatalog = await new ColorCatalogBuilder(_db).Set(Job.ColorCatalogGuid).WithGroups().WithItems().BuildAsync();
+                        SelectedCatalog = await new CatalogBuilder(_db).Set(Job.ColorCatalogGuid).WithGroups().WithItems().BuildAsync();
 
                         if (SelectedCatalog != null)
                         {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
index e80154413..798b333e7 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs
@@ -48,7 +48,8 @@ namespace Tango.PPC.Jobs.ViewModels
     public class JobsViewVM : PPCViewModel<IJobsView>
     {
         private ObservablesContext _db; //Holds the db context for the job list.
-        private ObservableCollection<ColorCatalog> _catalogs; //Holds the available color catalogs.
+        private ObservableCollection<ColorCatalog> _catalogs; //Holds the available color catalogs for the site.
+        private ObservableCollection<Rml> _rmls; //Holds the available RML for the site.
 
         public enum JobsCategory
         {
@@ -505,7 +506,7 @@ namespace Tango.PPC.Jobs.ViewModels
                 job.ColorSpaceGuid = Adapter.ColorSpaces.FirstOrDefault(x => x.Code == vm.SelectedColorSpace.ToInt32()).Guid;
                 job.MachineGuid = MachineProvider.Machine.Guid;
                 job.UserGuid = AuthenticationProvider.CurrentUser.Guid;
-                job.RmlGuid = Settings.DefaultRmlGuid != null ? Settings.DefaultRmlGuid : Adapter.Rmls.FirstOrDefault().Guid;
+                job.RmlGuid = Settings.DefaultRmlGuid != null ? Settings.DefaultRmlGuid : _rmls.FirstOrDefault().Guid;
                 job.WindingMethodGuid = Adapter.WindingMethods.FirstOrDefault().Guid;
                 job.SpoolTypeGuid = Settings.DefaultSpoolTypeGuid != null ? Settings.DefaultSpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault().Guid;
 
@@ -726,9 +727,10 @@ namespace Tango.PPC.Jobs.ViewModels
             StorageProvider.RegisterFileHandler(ExplorerFileDefinition.Pulse.Extension, HandlePulseFileLoaded);
 
             //Load catalogs.
-            using (ObservablesContext c = ObservablesContext.CreateDefault())
+            using (ObservablesContext db = ObservablesContext.CreateDefault())
             {
-                _catalogs = (await c.ColorCatalogs.ToListAsync()).ToObservableCollection();
+                _catalogs = await new CatalogsCollectionBuilder(db).SetAll().WithSite(MachineProvider.Machine.SiteGuid).BuildAsync();
+                _rmls = await new RmlsCollectionBuilder(db).SetAll().WithSite(MachineProvider.Machine.SiteGuid).BuildAsync();
             }
 
             MachineDataSynchronizer.SynchronizationEnded += MachineDataSynchronizer_SynchronizationEnded;
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
index 1af9b8609..d12617264 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
@@ -9,6 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Data;
 using Tango.BL;
+using Tango.BL.Builders;
 using Tango.BL.Entities;
 using Tango.BL.Enumerations;
 using Tango.Core.Commands;
@@ -52,6 +53,13 @@ namespace Tango.PPC.MachineSettings.ViewModels
             set { _selectedColorSpaces = value; RaisePropertyChangedAuto(); }
         }
 
+        private ObservableCollection<Rml> _rmls;
+        public ObservableCollection<Rml> Rmls
+        {
+            get { return _rmls; }
+            set { _rmls = value; RaisePropertyChangedAuto(); }
+        }
+
         private bool _enableHotSpot;
         public bool EnableHotSpot
         {
@@ -211,11 +219,16 @@ namespace Tango.PPC.MachineSettings.ViewModels
 
         }
 
-        public override void OnApplicationReady()
+        public async override void OnApplicationReady()
         {
             base.OnApplicationReady();
             MachineDataSynchronizer.SynchronizationStarted += (_, __) => InvalidateRelayCommands();
             MachineDataSynchronizer.SynchronizationEnded += (_, __) => InvalidateRelayCommands();
+
+            using (ObservablesContext db = ObservablesContext.CreateDefault())
+            {
+                Rmls = await new RmlsCollectionBuilder(db).SetAll().WithSite(MachineProvider.Machine.SiteGuid).BuildAsync();
+            }
         }
 
         public override void OnNavigatedTo()
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
index e8bd657a0..017649f8e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml
@@ -137,7 +137,7 @@
                                             </ItemsControl>
 
                                             <TextBlock VerticalAlignment="Bottom">Default Thread</TextBlock>
-                                            <touch:TouchComboBox HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" ItemsSource="{Binding Adapter.Rmls}" SelectedItem="{Binding DefaultRML}" DisplayMemberPath="Name"></touch:TouchComboBox>
+                                            <touch:TouchComboBox HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" ItemsSource="{Binding Rmls}" SelectedItem="{Binding DefaultRML}" DisplayMemberPath="Name"></touch:TouchComboBox>
 
                                             <TextBlock VerticalAlignment="Bottom">Default Spool</TextBlock>
                                             <touch:TouchComboBox HorizontalAlignment="Right" VerticalAlignment="Bottom" Width="200" ItemsSource="{Binding Adapter.SpoolTypes}" SelectedItem="{Binding DefaultSpoolType}" DisplayMemberPath="Name"></touch:TouchComboBox>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
index 0c3800d53..2f470df12 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs
@@ -205,6 +205,11 @@ namespace Tango.PPC.Common
         public String LastPowerUpSelectedRmlGuid { get; set; }
 
         /// <summary>
+        /// Gets or sets the power up screen timeout.
+        /// </summary>
+        public TimeSpan PowerUpScreenTimeout { get; set; }
+
+        /// <summary>
         /// Gets the machine service address.
         /// </summary>
         /// <returns></returns>
@@ -243,6 +248,7 @@ namespace Tango.PPC.Common
             SynchronizeDiagnostics = true;
             SynchronizationInterval = TimeSpan.FromMinutes(60);
             FirmwareVersion = "1.0.0.0";
+            PowerUpScreenTimeout = TimeSpan.FromSeconds(20);
         }
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs
index 22e489ffa..413b8453d 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs
@@ -5,6 +5,8 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Timers;
 using Tango.BL.Entities;
+using Tango.PPC.Common;
+using Tango.Settings;
 using Tango.SharedUI;
 
 namespace Tango.PPC.UI.Dialogs
@@ -83,7 +85,7 @@ namespace Tango.PPC.UI.Dialogs
 
         public PowerUpViewVM()
         {
-            RemainingSeconds = 20;
+            RemainingSeconds = (int)SettingsManager.Default.GetOrCreate<PPCSettings>().PowerUpScreenTimeout.TotalSeconds;
             CanClose = false;
             IsMinimalTemperature = true;
             IsTimeoutEnabled = true;
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
index 48e59562c..c3fa97d13 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs
@@ -109,7 +109,7 @@ namespace Tango.PPC.UI.ViewModels
 
                 using (ObservablesContext db = ObservablesContext.CreateDefault())
                 {
-                    rmls = await db.Rmls.ToListAsync();
+                    rmls = await new RmlsCollectionBuilder(db).SetAll().WithSite(MachineProvider.Machine.SiteGuid).BuildListAsync();
                 }
 
                 var selectedRml = rmls.SingleOrDefault(x => x.Guid == Settings.LastPowerUpSelectedRmlGuid);
@@ -143,7 +143,7 @@ namespace Tango.PPC.UI.ViewModels
                             }
                             else
                             {
-                                var rmlsToAvg = new RmlsCollectionBuilder(db).SetAll().WithActiveParametersGroup().Build();
+                                var rmlsToAvg = new RmlsCollectionBuilder(db).SetAll().WithSite(MachineProvider.Machine.SiteGuid).WithActiveParametersGroup().Build();
                                 processTables = rmlsToAvg.Select(x => x.GetActiveProcessGroup()).SelectMany(x => x.ProcessParametersTables).ToList();
                             }
 
diff --git a/Software/Visual_Studio/Tango.BL/Builders/ColorCatalogBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/CatalogBuilder.cs
index 5ddc84bc5..ffe6924dd 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/ColorCatalogBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/CatalogBuilder.cs
@@ -8,14 +8,14 @@ using System.Data.Entity;
 
 namespace Tango.BL.Builders
 {
-    public class ColorCatalogBuilder : EntityBuilderBase<ColorCatalog, ColorCatalogBuilder>
+    public class CatalogBuilder : EntityBuilderBase<ColorCatalog, CatalogBuilder>
     {
-        public ColorCatalogBuilder(ObservablesContext context) : base(context)
+        public CatalogBuilder(ObservablesContext context) : base(context)
         {
 
         }
 
-        public virtual ColorCatalogBuilder WithGroups()
+        public virtual CatalogBuilder WithGroups()
         {
             return AddQueryStep(1, (query) =>
             {
@@ -23,7 +23,7 @@ namespace Tango.BL.Builders
             });
         }
 
-        public virtual ColorCatalogBuilder WithItems()
+        public virtual CatalogBuilder WithItems()
         {
             return AddQueryStep(2, (query) =>
             {
@@ -31,7 +31,7 @@ namespace Tango.BL.Builders
             });
         }
 
-        public virtual ColorCatalogBuilder WithRecipes(Rml rml = null)
+        public virtual CatalogBuilder WithRecipes(Rml rml = null)
         {
             return AddQueryStep(3, (query) =>
             {
diff --git a/Software/Visual_Studio/Tango.BL/Builders/CatalogsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/CatalogsCollectionBuilder.cs
new file mode 100644
index 000000000..9b24899c4
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Builders/CatalogsCollectionBuilder.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+using System.Data.Entity;
+
+namespace Tango.BL.Builders
+{
+    public class CatalogsCollectionBuilder : EntityCollectionBuilderBase<ColorCatalog, CatalogsCollectionBuilder>
+    {
+        public CatalogsCollectionBuilder(ObservablesContext context) : base(context)
+        {
+        }
+
+        public virtual CatalogsCollectionBuilder WithSite(String siteGuid)
+        {
+            return AddQueryStep(1, (query) =>
+            {
+                if (siteGuid != null)
+                {
+                    var siteCatalogsGuids = Context.SitesCatalogs.Where(x => x.SiteGuid == siteGuid).ToList().Select(x => x.CatalogGuid).Where(x => x != null).Distinct().ToArray();
+
+                    if (siteCatalogsGuids.Length > 0)
+                    {
+                        return query.Where(x => siteCatalogsGuids.Contains(x.Guid));
+                    }
+                    else
+                    {
+                        return query;
+                    }
+                }
+                else
+                {
+                    return query;
+                }
+            });
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs b/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs
index 055f02474..9408d714b 100644
--- a/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs
+++ b/Software/Visual_Studio/Tango.BL/Builders/RmlsCollectionBuilder.cs
@@ -14,10 +14,34 @@ namespace Tango.BL.Builders
         {
         }
 
-        public virtual RmlsCollectionBuilder WithCCT()
+        public virtual RmlsCollectionBuilder WithSite(String siteGuid)
         {
             return AddQueryStep(1, (query) =>
             {
+                if (siteGuid != null)
+                {
+                    var siteRmlsGuids = Context.SitesRmls.Where(x => x.SiteGuid == siteGuid).ToList().Select(x => x.RmlGuid).Where(x => x != null).Distinct().ToArray();
+
+                    if (siteRmlsGuids.Length > 0)
+                    {
+                        return query.Where(x => siteRmlsGuids.Contains(x.Guid));
+                    }
+                    else
+                    {
+                        return query;
+                    }
+                }
+                else
+                {
+                    return query;
+                }
+            });
+        }
+
+        public virtual RmlsCollectionBuilder WithCCT()
+        {
+            return AddQueryStep(2, (query) =>
+            {
                 return query.Include(x => x.Cct);
             });
         }
diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTO.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTO.cs
new file mode 100644
index 000000000..4e1d44e6d
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTO.cs
@@ -0,0 +1,14 @@
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.DTO
+{
+    public class SitesCatalogDTO : SitesCatalogDTOBase
+    {
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTOBase.cs
new file mode 100644
index 000000000..b673d5660
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/DTO/SitesCatalogDTOBase.cs
@@ -0,0 +1,41 @@
+
+//------------------------------------------------------------------------------
+// <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.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL.Entities;
+
+namespace Tango.BL.DTO
+{
+    public abstract class SitesCatalogDTOBase : ObservableEntityDTO<SitesCatalogDTO, SitesCatalog>
+    {
+
+        /// <summary>
+        /// site guid
+        /// </summary>
+        public String SiteGuid 
+        {
+            get; set; 
+        }
+
+        /// <summary>
+        /// catalog guid
+        /// </summary>
+        public String CatalogGuid 
+        {
+            get; set; 
+        }
+
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs
index bbc55d245..c6c166498 100644
--- a/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs
+++ b/Software/Visual_Studio/Tango.BL/Entities/HardwareBlowerBase.cs
@@ -129,10 +129,6 @@ namespace Tango.BL.Entities
         /// </summary>
 
         [Column("VOLTAGE")]
-
-        [Description("Voltage Description")]
-        [Range(-10000,1000000)]
-
         public  Double Voltage
         {
             get 
diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesCatalog.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesCatalog.cs
new file mode 100644
index 000000000..886d06719
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/SitesCatalog.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.BL.Entities
+{
+    public class SitesCatalog : SitesCatalogBase
+    {
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs b/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs
new file mode 100644
index 000000000..85175d6ad
--- /dev/null
+++ b/Software/Visual_Studio/Tango.BL/Entities/SitesCatalogBase.cs
@@ -0,0 +1,86 @@
+//------------------------------------------------------------------------------
+// <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_CATALOGS")]
+    public abstract class SitesCatalogBase : ObservableEntity<SitesCatalog>
+    {
+
+        protected String _siteguid;
+
+        /// <summary>
+        /// Gets or sets the sitescatalogbase site guid.
+        /// </summary>
+
+        [Column("SITE_GUID")]
+
+        public  String SiteGuid
+        {
+            get 
+            {
+                return _siteguid; 
+            }
+
+            set 
+            {
+                if (_siteguid != value)
+                {
+                    _siteguid = value;
+
+                }
+            }
+        }
+
+        protected String _catalogguid;
+
+        /// <summary>
+        /// Gets or sets the sitescatalogbase catalog guid.
+        /// </summary>
+
+        [Column("CATALOG_GUID")]
+
+        public  String CatalogGuid
+        {
+            get 
+            {
+                return _catalogguid; 
+            }
+
+            set 
+            {
+                if (_catalogguid != value)
+                {
+                    _catalogguid = value;
+
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SitesCatalogBase" /> class.
+        /// </summary>
+        public SitesCatalogBase() : base()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
index d47f6514b..4eaf256d2 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesContext.cs
@@ -519,6 +519,14 @@ namespace Tango.BL
         }
 
         /// <summary>
+        /// Gets or sets the SitesCatalogs.
+        /// </summary>
+        public DbSet<SitesCatalog> SitesCatalogs 
+        {
+            get; set; 
+        }
+
+        /// <summary>
         /// Gets or sets the SitesRmls.
         /// </summary>
         public DbSet<SitesRml> SitesRmls 
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
index 139c90158..c86933713 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesEntitiesAdapterExtension.cs
@@ -2249,6 +2249,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<SitesCatalog> _sitescatalogs;
+        /// <summary>
+        /// Gets or sets the SitesCatalogs.
+        /// </summary>
+        public ObservableCollection<SitesCatalog> SitesCatalogs
+        {
+            get 
+            {
+                return _sitescatalogs; 
+            }
+
+            set 
+            {
+                _sitescatalogs = value; RaisePropertyChanged(nameof(SitesCatalogs)); 
+            }
+
+        }
+
+        private ICollectionView _sitescatalogsViewSource;
+        /// <summary>
+        /// Gets or sets the SitesCatalogs View Source.
+        ///</summary>
+        public ICollectionView SitesCatalogsViewSource
+        {
+            get 
+            {
+                return _sitescatalogsViewSource; 
+            }
+
+            set 
+            {
+                _sitescatalogsViewSource = value; RaisePropertyChanged(nameof(SitesCatalogsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<SitesRml> _sitesrmls;
         /// <summary>
         /// Gets or sets the SitesRmls.
@@ -2919,6 +2955,8 @@ namespace Tango.BL
 
             SitesViewSource = CreateCollectionView(Sites);
 
+            SitesCatalogsViewSource = CreateCollectionView(SitesCatalogs);
+
             SitesRmlsViewSource = CreateCollectionView(SitesRmls);
 
             SpoolTypesViewSource = CreateCollectionView(SpoolTypes);
diff --git a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
index e509d0e3c..efa188fec 100644
--- a/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
+++ b/Software/Visual_Studio/Tango.BL/ObservablesStaticCollectionsExtension.cs
@@ -2249,6 +2249,42 @@ namespace Tango.BL
 
         }
 
+        private ObservableCollection<SitesCatalog> _sitescatalogs;
+        /// <summary>
+        /// Gets or sets the SitesCatalogs.
+        /// </summary>
+        public ObservableCollection<SitesCatalog> SitesCatalogs
+        {
+            get 
+            {
+                return _sitescatalogs; 
+            }
+
+            set 
+            {
+                _sitescatalogs = value; RaisePropertyChanged(nameof(SitesCatalogs)); 
+            }
+
+        }
+
+        private ICollectionView _sitescatalogsViewSource;
+        /// <summary>
+        /// Gets or sets the SitesCatalogs View Source.
+        ///</summary>
+        public ICollectionView SitesCatalogsViewSource
+        {
+            get 
+            {
+                return _sitescatalogsViewSource; 
+            }
+
+            set 
+            {
+                _sitescatalogsViewSource = value; RaisePropertyChanged(nameof(SitesCatalogsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<SitesRml> _sitesrmls;
         /// <summary>
         /// Gets or sets the SitesRmls.
@@ -2919,6 +2955,8 @@ namespace Tango.BL
 
             SitesViewSource = CreateCollectionView(Sites);
 
+            SitesCatalogsViewSource = CreateCollectionView(SitesCatalogs);
+
             SitesRmlsViewSource = CreateCollectionView(SitesRmls);
 
             SpoolTypesViewSource = CreateCollectionView(SpoolTypes);
diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
index d75cdc0c1..99855796d 100644
--- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
+++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj
@@ -84,7 +84,7 @@
     <Compile Include="..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
-    <Compile Include="Builders\ColorCatalogBuilder.cs" />
+    <Compile Include="Builders\CatalogBuilder.cs" />
     <Compile Include="Builders\ConfigurationBuilder.cs" />
     <Compile Include="Builders\EntityBuilderBase.cs" />
     <Compile Include="Builders\EntityCollectionBuilderBase.cs" />
@@ -93,6 +93,7 @@
     <Compile Include="Builders\IEntityCollectionBuilder.cs" />
     <Compile Include="Builders\JobBuilder.cs" />
     <Compile Include="Builders\JobRunsBuilder.cs" />
+    <Compile Include="Builders\CatalogsCollectionBuilder.cs" />
     <Compile Include="Builders\TangoUpdatesCollectionBuilder.cs" />
     <Compile Include="Builders\JobsCollectionBuilder.cs" />
     <Compile Include="Builders\MachineBuilder.cs" />
@@ -236,6 +237,8 @@
     <Compile Include="DTO\SegmentDTOBase.cs" />
     <Compile Include="DTO\SiteDTO.cs" />
     <Compile Include="DTO\SiteDTOBase.cs" />
+    <Compile Include="DTO\SitesCatalogDTO.cs" />
+    <Compile Include="DTO\SitesCatalogDTOBase.cs" />
     <Compile Include="DTO\SitesRmlDTO.cs" />
     <Compile Include="DTO\SitesRmlDTOBase.cs" />
     <Compile Include="DTO\SpoolDTO.cs" />
@@ -339,6 +342,8 @@
     <Compile Include="Entities\SegmentBase.cs" />
     <Compile Include="Entities\Site.cs" />
     <Compile Include="Entities\SiteBase.cs" />
+    <Compile Include="Entities\SitesCatalog.cs" />
+    <Compile Include="Entities\SitesCatalogBase.cs" />
     <Compile Include="Entities\SitesRml.cs" />
     <Compile Include="Entities\SitesRmlBase.cs" />
     <Compile Include="Entities\Spool.cs" />
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 9f81121ca..3ef793f7f 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -87,6 +87,7 @@ namespace Tango.DAL.Remote.DB
         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_CATALOGS> SITES_CATALOGS { 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; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
index 2c003669e..fe8f0194b 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -933,6 +933,16 @@
           <Property Name="NAME" Type="nvarchar" MaxLength="100" Nullable="false" />
           <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="200" />
         </EntityType>
+        <EntityType Name="SITES_CATALOGS">
+          <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="CATALOG_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
         <EntityType Name="SITES_RMLS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -2252,6 +2262,7 @@
           <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_CATALOGS" EntityType="Self.SITES_CATALOGS" 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" />
@@ -2660,6 +2671,7 @@
           <EntitySet Name="ROLES_PERMISSIONS" EntityType="RemoteModel.ROLES_PERMISSIONS" />
           <EntitySet Name="SEGMENTS" EntityType="RemoteModel.SEGMENT" />
           <EntitySet Name="SITES" EntityType="RemoteModel.SITE" />
+          <EntitySet Name="SITES_CATALOGS" EntityType="RemoteModel.SITES_CATALOGS" />
           <EntitySet Name="SITES_RMLS" EntityType="RemoteModel.SITES_RMLS" />
           <EntitySet Name="SPOOL_TYPES" EntityType="RemoteModel.SPOOL_TYPES" />
           <EntitySet Name="SPOOLS" EntityType="RemoteModel.SPOOL" />
@@ -4080,6 +4092,16 @@
           <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_CATALOGS">
+          <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="CATALOG_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+        </EntityType>
         <EntityType Name="SITES_RMLS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -6351,6 +6373,17 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="SITES_CATALOGS">
+            <EntityTypeMapping TypeName="RemoteModel.SITES_CATALOGS">
+              <MappingFragment StoreEntitySet="SITES_CATALOGS">
+                <ScalarProperty Name="CATALOG_GUID" ColumnName="CATALOG_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="SITES_RMLS">
             <EntityTypeMapping TypeName="RemoteModel.SITES_RMLS">
               <MappingFragment StoreEntitySet="SITES_RMLS">
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 e7b00e86f..6abe85e1b 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,83 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <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" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3.75" PointY="28" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="3.75" PointY="66.5" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="57.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="3.75" PointY="63.5" />
+        <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="16" PointY="21.5" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="11.25" PointY="39.125" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="13.5" PointY="20.25" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="20.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="3.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="8.5" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="7.25" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="16.125" />
+        <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="6" PointY="24" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6" PointY="63.25" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3.75" PointY="32" />
+        <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="8.25" PointY="27.625" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="9" PointY="35.125" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="11.25" PointY="34.625" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="60.625" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="14.25" PointY="10.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="30.125" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="16.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="9.75" PointY="62" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="12" PointY="63.625" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="79" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="9" PointY="69.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="9.75" PointY="82" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12" PointY="75.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="3.75" PointY="73.875" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="6" PointY="68.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="9.75" PointY="78" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="12" PointY="68" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="6.75" PointY="83" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="9" PointY="73.75" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="3.75" PointY="69.375" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="6.75" PointY="60" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9" PointY="65.75" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="11.25" PointY="30.875" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="13.5" PointY="32.875" />
+        <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="3.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="10.5" PointY="16.875" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="13.375" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="11.25" PointY="2.625" />
+        <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="10.5" PointY="12.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6" PointY="4.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="8.25" PointY="17.125" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="16.5" PointY="17" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="24.25" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="27.125" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="33" />
+        <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="11.25" PointY="42.125" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="6" PointY="30" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="11.25" PointY="49.5" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="50.875" />
+        <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="52.5" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="17.25" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="11.25" PointY="45.375" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="13.5" PointY="45.5" />
+        <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="12.75" PointY="24.375" />
+        <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="5.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="7.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="13.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="12" />
+        <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="13.5" PointY="16.25" />
+        <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="13.75" PointY="3.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="15.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="10.5" PointY="7.625" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="15.75" PointY="4.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="16.75" PointY="8.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="16.75" PointY="11.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="17.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="5.75" />
+        <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="10.75" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="8.25" PointY="11.5" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="13.5" PointY="7.5" />
+        <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="8.25" PointY="30.75" />
         <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/SITES_CATALOGS.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_CATALOGS.cs
new file mode 100644
index 000000000..df712045c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/SITES_CATALOGS.cs
@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated from a template.
+//
+//     Manual changes to this file may cause unexpected behavior in your application.
+//     Manual changes to this file will be overwritten if the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.DAL.Remote.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class SITES_CATALOGS
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public string SITE_GUID { get; set; }
+        public string CATALOG_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 4150c2771..75fa9179c 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -264,6 +264,9 @@
     <Compile Include="DB\SITE.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\SITES_CATALOGS.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\SITES_RMLS.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml
index 733b4ae8e..c36c6a9b7 100644
--- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml
+++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml
index 083c7cf12..97dad3717 100644
--- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml
+++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml