From 2ea2bb5bcd96045f1bd6cb4c3d8b8416dbaa05dc Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Tue, 26 Dec 2017 21:16:15 +0200
Subject: MERGE

---
 .../ViewModels/MainViewVM.cs                       | 525 +++++++++++++++++++++
 1 file changed, 525 insertions(+)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs')

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs
new file mode 100644
index 000000000..d7e641735
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs
@@ -0,0 +1,525 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using Tango.Core.Commands;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.MachineStudio.Common.StudioApplication;
+using Tango.Scripting;
+using Tango.Settings;
+using Tango.SharedUI;
+using Tango.Stubs;
+using Tango.Transport;
+using Tango.Transport.Adapters;
+
+namespace Tango.MachineStudio.Stubs.ViewModels
+{
+    /// <summary>
+    /// Represents the script execution utility main view model.
+    /// </summary>
+    /// <seealso cref="Tango.SharedUI.ViewModel" />
+    public class MainViewVM : ViewModel
+    {
+        private UsbTransportAdapter _adapter; //Holds the USB transport adapter.
+        private StubManager _stubManager;
+        private INotificationProvider _notification;
+
+        #region Properties
+
+        public IStudioApplicationManager ApplicationManager { get; set; }
+
+        private bool _useConnectedMachine;
+        /// <summary>
+        /// Gets or sets a value indicating whether [use connected machine].
+        /// </summary>
+        public bool UseConnectedMachine
+        {
+            get { return _useConnectedMachine; }
+            set { _useConnectedMachine = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the code tabs.
+        /// </summary>
+        public ObservableCollection<CodeTabVM> CodeTabs { get; set; }
+
+        /// <summary>
+        /// Gets or sets the additional highlight C# types.
+        /// </summary>
+        public ObservableCollection<KeyValuePair<String, Type>> HighlightTypes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the collection of stub snippets.
+        /// </summary>
+        public ObservableCollection<StubSnippetVM> StubSnippets { get; set; }
+
+        private StubSnippetVM _selectedStubSnippet;
+        /// <summary>
+        /// Gets or sets the selected stub snippet.
+        /// </summary>
+        public StubSnippetVM SelectedStubSnippet
+        {
+            get { return _selectedStubSnippet; }
+            set { _selectedStubSnippet = value; RaisePropertyChanged(nameof(SelectedStubSnippet)); }
+        }
+
+        private String _log;
+        /// <summary>
+        /// Gets or sets the current response log.
+        /// </summary>
+        public String Log
+        {
+            get { return _log; }
+            set { _log = value; RaisePropertyChanged(nameof(Log)); }
+        }
+
+        private CodeTabVM _selectedCodeTab;
+        /// <summary>
+        /// Gets or sets the selected code tab.
+        /// </summary>
+        public CodeTabVM SelectedCodeTab
+        {
+            get { return _selectedCodeTab; }
+            set { _selectedCodeTab = value; RaisePropertyChanged(nameof(SelectedCodeTab)); InvalidateRelayCommands(); }
+        }
+
+        private bool _isConnected;
+        /// <summary>
+        /// Gets or sets a value indicating whether the USB adapter is connected.
+        /// </summary>
+        public bool IsConnected
+        {
+            get { return _isConnected; }
+            set { _isConnected = value; RaisePropertyChanged(nameof(IsConnected)); InvalidateRelayCommands(); }
+        }
+
+        private List<String> _ports;
+        /// <summary>
+        /// Gets or sets the available USB ports.
+        /// </summary>
+        public List<String> Ports
+        {
+            get { return _ports; }
+            set { _ports = value; RaisePropertyChanged(nameof(Ports)); }
+        }
+
+        private String _selectedPort;
+        /// <summary>
+        /// Gets or sets the selected USB port.
+        /// </summary>
+        public String SelectedPort
+        {
+            get { return _selectedPort; }
+            set { _selectedPort = value; RaisePropertyChanged(nameof(SelectedPort)); InvalidateRelayCommands(); }
+        }
+
+        private String _status;
+        /// <summary>
+        /// Gets or sets the current status bar text.
+        /// </summary>
+        public String Status
+        {
+            get { return _status; }
+            set { _status = value; RaisePropertyChanged(nameof(Status)); }
+        }
+
+        private bool _isRunning;
+        /// <summary>
+        /// Gets or sets a value indicating whether a stub is currently running.
+        /// </summary>
+        public bool IsRunning
+        {
+            get { return _isRunning; }
+            set { _isRunning = value; RaisePropertyChanged(nameof(IsRunning)); InvalidateRelayCommands(); }
+        }
+
+        #endregion
+
+        #region Commands
+
+        /// <summary>
+        /// Gets or sets the new command.
+        /// </summary>
+        public RelayCommand NewCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the close tab command.
+        /// </summary>
+        public RelayCommand<CodeTabVM> CloseTabCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the run command.
+        /// </summary>
+        public RelayCommand RunCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the stop command.
+        /// </summary>
+        public RelayCommand StopCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the toggle connection command.
+        /// </summary>
+        public RelayCommand ToggleConnectionCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the open command.
+        /// </summary>
+        public RelayCommand OpenCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the save command.
+        /// </summary>
+        public RelayCommand SaveCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the save as command.
+        /// </summary>
+        public RelayCommand SaveAsCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the stub snippet selected command.
+        /// </summary>
+        public RelayCommand StubSnippetSelectedCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the insert snippet command.
+        /// </summary>
+        public RelayCommand<String> InsertSnippetCommand { get; set; }
+
+        /// <summary>
+        /// Gets or sets the exit command.
+        /// </summary>
+        public RelayCommand ExitCommand { get; set; }
+
+        #endregion
+
+        #region Constructors
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MainViewVM"/> class.
+        /// </summary>
+        public MainViewVM(IStudioApplicationManager applicationManager, INotificationProvider notification)
+        {
+            ApplicationManager = applicationManager;
+            _notification = notification;
+
+            CodeTabs = new ObservableCollection<CodeTabVM>();
+
+            NewCommand = new RelayCommand(CreateNewTab);
+            CloseTabCommand = new RelayCommand<CodeTabVM>(OnTabClosing);
+            RunCommand = new RelayCommand(RunTab, (x) => (IsConnected || UseConnectedMachine) && !IsRunning && SelectedCodeTab != null);
+            StopCommand = new RelayCommand(StopTab, (x) => (IsConnected || UseConnectedMachine) && IsRunning && SelectedCodeTab != null);
+            InsertSnippetCommand = new RelayCommand<string>((x) => { });
+
+            HighlightTypes = new ObservableCollection<KeyValuePair<string, Type>>();
+            HighlightTypes.Add(new KeyValuePair<string, Type>("stubManager", typeof(StubManager)));
+
+            StubSnippets = new ObservableCollection<StubSnippetVM>();
+
+            foreach (var stubType in StubBase.GetAvailableRequestStubs())
+            {
+                StubSnippetVM snippet = new StubSnippetVM();
+                snippet.Name = stubType.Name.Replace("Stub_", "");
+                snippet.Code = String.Format("stubManager.Run(\"{0}\" ,{1});", stubType.Name, String.Join(", ", stubType.GetProperties(BindingFlags.Public | BindingFlags.Instance).Select(x => x.PropertyType.Name == "string" ? "\"string\"" : x.PropertyType.Name)));
+                StubSnippets.Add(snippet);
+            }
+
+            ToggleConnectionCommand = new RelayCommand(ToggleConnection, (x) => !IsRunning);
+            OpenCommand = new RelayCommand(OpenFile);
+            SaveCommand = new RelayCommand(SaveFile);
+            SaveAsCommand = new RelayCommand(SaveAsFile);
+            StubSnippetSelectedCommand = new RelayCommand(OnStubSnippetSelected);
+            ExitCommand = new RelayCommand(() => Application.Current.Shutdown());
+
+            Ports = new List<string>()
+            {
+                "COM1",
+                "COM2",
+                "COM3",
+                "COM4",
+                "COM5",
+                "COM6",
+                "COM7",
+                "COM8",
+                "COM9",
+            };
+
+            SelectedPort = SettingsManager.Default.StubsUI.SelectedPort != null ? SettingsManager.Default.StubsUI.SelectedPort : Ports.First();
+
+            Status = "Ready";
+
+            if (SettingsManager.Default.StubsUI.LastTabs.Count > 0)
+            {
+                foreach (var file in SettingsManager.Default.StubsUI.LastTabs)
+                {
+                    if (File.Exists(file))
+                    {
+                        OpenFile(file);
+                    }
+                }
+            }
+            else
+            {
+                CreateNewTab();
+            }
+
+            Application.Current.Exit += Current_Exit;
+        }
+
+        #endregion
+
+        #region Virtual Methods
+
+        /// <summary>
+        /// Called when a stub snippet is double clicked.
+        /// </summary>
+        protected virtual void OnStubSnippetSelected()
+        {
+            if (SelectedStubSnippet != null)
+            {
+                if (InsertSnippetCommand != null)
+                {
+                    InsertSnippetCommand.Execute(SelectedStubSnippet.Code);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Called when user closes a script tab.
+        /// </summary>
+        /// <param name="codeTab">The code tab.</param>
+        protected virtual void OnTabClosing(CodeTabVM codeTab)
+        {
+            CodeTabs.Remove(codeTab);
+        }
+
+        #endregion
+
+        #region Private Methods
+
+        /// <summary>
+        /// Saves the selected script file.
+        /// </summary>
+        private void SaveFile()
+        {
+            if (SelectedCodeTab != null)
+            {
+                if (SelectedCodeTab.File == null)
+                {
+                    SaveAsFile();
+                }
+                else
+                {
+                    File.WriteAllText(SelectedCodeTab.File, SelectedCodeTab.Code);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Saves the selected script file.
+        /// </summary>
+        private void SaveAsFile()
+        {
+            if (SelectedCodeTab != null)
+            {
+                SaveFileDialog dlg = new SaveFileDialog();
+                dlg.Filter = "C# Script Files|*.cs";
+                dlg.DefaultExt = ".cs";
+                if (dlg.ShowDialog().Value)
+                {
+                    File.WriteAllText(dlg.FileName, SelectedCodeTab.Code);
+                    SelectedCodeTab.File = dlg.FileName;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Opens a script from HD.
+        /// </summary>
+        private void OpenFile()
+        {
+            OpenFileDialog dlg = new OpenFileDialog();
+            dlg.Filter = "C# Script Files|*.cs";
+            dlg.Multiselect = true;
+            if (dlg.ShowDialog().Value)
+            {
+                foreach (var file in dlg.FileNames)
+                {
+                    OpenFile(file);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Opens the file.
+        /// </summary>
+        /// <param name="file">The file.</param>
+        private void OpenFile(String file)
+        {
+            var newTab = new CodeTabVM();
+            newTab.File = file;
+            newTab.Code = File.ReadAllText(file);
+            CodeTabs.Add(newTab);
+            SelectedCodeTab = newTab;
+        }
+
+        /// <summary>
+        /// Toggles the USB adapter connection.
+        /// </summary>
+        private void ToggleConnection()
+        {
+            try
+            {
+                if (!IsConnected)
+                {
+                    _adapter = new UsbTransportAdapter(SelectedPort);
+                    _adapter.Connect().Wait();
+                    IsConnected = true;
+                }
+                else
+                {
+                    _adapter.Disconnect().Wait();
+                    IsConnected = false;
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.ToString(), "Tango");
+            }
+        }
+
+        /// <summary>
+        /// Creates a new script tab.
+        /// </summary>
+        private void CreateNewTab()
+        {
+            var newTab = new CodeTabVM();
+            CodeTabs.Add(newTab);
+            SelectedCodeTab = newTab;
+        }
+
+        /// <summary>
+        /// Runs the selected script tab.
+        /// </summary>
+        private async void RunTab()
+        {
+            if (UseConnectedMachine && !ApplicationManager.IsMachineConnected)
+            {
+                _notification.ShowError("Cannot execute stub while 'Connected Machine' is set but not machine connected.");
+                return;
+            }
+
+            IsRunning = true;
+            SelectedCodeTab.IsRunning = true;
+            Log = (DateTime.Now.ToTimeString() + ": ") + "Executing script '" + SelectedCodeTab.Title + "'..." + Environment.NewLine;
+
+            await Task.Factory.StartNew(async () =>
+            {
+                try
+                {
+                    ITransportAdapter adapter = _adapter;
+
+                    if (ApplicationManager.IsMachineConnected && UseConnectedMachine)
+                    {
+                        adapter = ApplicationManager.ConnectedMachine.Adapters.First();
+                    }
+
+                    _stubManager = new StubManager(adapter);
+                    var thisStubManager = _stubManager;
+                    _stubManager.Completed += Manager_Completed;
+                    _stubManager.Failed += Manager_Failed;
+                    _stubManager.Executed += Manager_Executed;
+
+                    ScriptEngine engine = new ScriptEngine(new StubOnExecuteParameters(_stubManager));
+
+                    engine.ReferencedAssemblies.Add(this.GetType());
+                    await engine.Run(SelectedCodeTab.Code);
+
+                    if (!thisStubManager.Aborted)
+                    {
+                        IsRunning = false;
+                        SelectedCodeTab.IsRunning = false;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    IsRunning = false;
+                    SelectedCodeTab.IsRunning = false;
+                    MessageBox.Show(ex.Message, "Tango");
+                }
+            });
+        }
+
+        /// <summary>
+        /// Stops the currently current script.
+        /// </summary>
+        private void StopTab()
+        {
+            if (_stubManager != null)
+            {
+                _stubManager.Abort();
+                IsRunning = false;
+                SelectedCodeTab.IsRunning = false;
+                Status = "Stopped!";
+                Log += (DateTime.Now.ToTimeString() + ": ") + "Stopped!" + Environment.NewLine;
+            }
+        }
+
+        #endregion
+
+        #region Event Handlers
+
+        /// <summary>
+        /// Handled the <see cref="StubManager"/> Executed event.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="stubName">Name of the stub.</param>
+        private void Manager_Executed(object sender, string stubName)
+        {
+            Log += (DateTime.Now.ToTimeString() + ": ") + "Executing '" + stubName + "'..." + Environment.NewLine;
+            Status = "Executing " + stubName + "...";
+        }
+
+        /// <summary>
+        /// Handled the <see cref="StubManager"/> Failed event.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="ex">The exception.</param>
+        private void Manager_Failed(object sender, Exception ex)
+        {
+            if (IsRunning)
+            {
+                Log += (DateTime.Now.ToTimeString() + ": ") + ex.Message + Environment.NewLine;
+                Status = "Failed!";
+            }
+        }
+
+        /// <summary>
+        /// Handled the <see cref="StubManager"/> Completed event.
+        /// </summary>
+        /// <param name="sender">The sender.</param>
+        /// <param name="response">The response.</param>
+        private void Manager_Completed(object sender, string response)
+        {
+            Log += (DateTime.Now.ToTimeString() + ": ") + "Response Received:" + Environment.NewLine;
+            Log += (DateTime.Now.ToTimeString() + ": ") + response + Environment.NewLine;
+            Status = "Completed";
+        }
+
+        private void Current_Exit(object sender, ExitEventArgs e)
+        {
+            SettingsManager.Default.MachineStudio.StubsModule.SelectedPort = SelectedPort;
+            SettingsManager.Default.MachineStudio.StubsModule.LastTabs = CodeTabs.Select(x => x.File).ToList();
+            SettingsManager.SaveDefaultSettings();
+        }
+
+        #endregion
+    }
+}
-- 
cgit v1.3.1


From 9d12fd0ba222619dd5b42816ed004c7b762809dd Mon Sep 17 00:00:00 2001
From: Roy <roy.mail.net@gmail.com>
Date: Tue, 26 Dec 2017 23:55:41 +0200
Subject: Added CCT & CAT to DB Module ! Implemented "deep filtering" on db
 module search.

---
 Software/DB/Tango.db                               | Bin 602112 -> 602112 bytes
 Software/DB/Tango.mdf                              | Bin 8388608 -> 8388608 bytes
 Software/DB/Tango_log.ldf                          | Bin 8388608 -> 8388608 bytes
 .../Converters/ByteArrayToFileSizeConverter.cs     |  34 ++++
 .../Tango.MachineStudio.DB.csproj                  |  31 +++
 .../Tango.MachineStudio.DB/ViewModelLocator.cs     |  19 ++
 .../ViewModels/CatsViewVM.cs                       |  41 ++++
 .../ViewModels/CctsViewVM.cs                       |  75 ++++++++
 .../ViewModels/DbTableViewModel.cs                 |  50 +++--
 .../Views/DBViews/CatView.xaml                     |  62 ++++++
 .../Views/DBViews/CatView.xaml.cs                  |  28 +++
 .../Views/DBViews/CatsView.xaml                    |  43 +++++
 .../Views/DBViews/CatsView.xaml.cs                 |  32 ++++
 .../Views/DBViews/CctView.xaml                     |  58 ++++++
 .../Views/DBViews/CctView.xaml.cs                  |  28 +++
 .../Views/DBViews/CctsView.xaml                    |  36 ++++
 .../Views/DBViews/CctsView.xaml.cs                 |  32 ++++
 .../ViewModels/MainViewVM.cs                       |   2 +-
 Software/Visual_Studio/Tango.DAL.Local/DB/CAT.cs   |  25 +++
 Software/Visual_Studio/Tango.DAL.Local/DB/CCT.cs   |  30 +++
 .../Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs  |   1 +
 .../Tango.DAL.Local/DB/LocalADO.Context.cs         |   2 +
 .../Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx |  96 ++++++++++
 .../Tango.DAL.Local/DB/LocalADO.edmx.diagram       |  64 ++++---
 .../Tango.DAL.Local/Tango.DAL.Local.csproj         |   6 +
 .../Tango.DAL.Observables/Entities/Cat.cs          | 133 +++++++++++++
 .../Tango.DAL.Observables/Entities/Cct.cs          | 209 +++++++++++++++++++++
 .../Tango.DAL.Observables/Entities/LiquidType.cs   |  21 +++
 .../Tango.DAL.Observables/Entities/Machine.cs      |  21 +++
 .../Tango.DAL.Observables/Entities/Rml.cs          |  21 +++
 .../Tango.DAL.Observables/ObservableEntity.cs      |   6 +-
 .../ObservablesEntitiesAdapter.cs                  |   4 +
 .../ObservablesEntitiesAdapterExtension.cs         |  76 ++++++++
 .../Tango.DAL.Observables.csproj                   |   2 +
 Software/Visual_Studio/Tango.DAL.Remote/DB/CAT.cs  |  28 +++
 Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs  |  32 ++++
 .../Tango.DAL.Remote/DB/LIQUID_TYPES.cs            |   3 +
 .../Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs   |   3 +
 Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs  |   3 +
 .../Tango.DAL.Remote/DB/RemoteADO.Context.cs       |   2 +
 .../Tango.DAL.Remote/DB/RemoteADO.edmx             | 195 +++++++++++++++++++
 .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram     |  83 ++++----
 .../Tango.DAL.Remote/Tango.DAL.Remote.csproj       |   6 +
 43 files changed, 1557 insertions(+), 86 deletions(-)
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/ByteArrayToFileSizeConverter.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CatsViewVM.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatView.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatView.xaml.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctView.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctView.xaml.cs
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctsView.xaml
 create mode 100644 Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctsView.xaml.cs
 create mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/CAT.cs
 create mode 100644 Software/Visual_Studio/Tango.DAL.Local/DB/CCT.cs
 create mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Cat.cs
 create mode 100644 Software/Visual_Studio/Tango.DAL.Observables/Entities/Cct.cs
 create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/CAT.cs
 create mode 100644 Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs

(limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs')

diff --git a/Software/DB/Tango.db b/Software/DB/Tango.db
index 0d057922b..a9e15d59e 100644
Binary files a/Software/DB/Tango.db and b/Software/DB/Tango.db differ
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 8c68d77f1..0537c561f 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index d80e67e97..370c5a60f 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/ByteArrayToFileSizeConverter.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/ByteArrayToFileSizeConverter.cs
new file mode 100644
index 000000000..8a690450c
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Converters/ByteArrayToFileSizeConverter.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Tango.MachineStudio.DB.Converters
+{
+    public class ByteArrayToFileSizeConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return BytesToString((int)value);
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        static String BytesToString(long byteCount)
+        {
+            string[] suf = { "B", "KB", "MB", "GB", "TB", "PB", "EB" }; //Longs run out around EB
+            if (byteCount == 0)
+                return "0" + suf[0];
+            long bytes = Math.Abs(byteCount);
+            int place = System.Convert.ToInt32(Math.Floor(Math.Log(bytes, 1024)));
+            double num = Math.Round(bytes / Math.Pow(1024, place), 1);
+            return (Math.Sign(byteCount) * num).ToString() + suf[place];
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
index 12af196bc..01cd9d1a9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Tango.MachineStudio.DB.csproj
@@ -87,6 +87,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Converters\ByteArrayToFileSizeConverter.cs" />
     <Compile Include="Converters\EventTypeActionsToStringConverter.cs" />
     <Compile Include="Converters\LiquidTypeRmlsToStringConverter.cs" />
     <Compile Include="Converters\RolesPermissionsToStringConverter.cs" />
@@ -101,6 +102,8 @@
     <Compile Include="ViewModels\ApplicationVersionsViewVM.cs" />
     <Compile Include="ViewModels\CartridgesViewVM.cs" />
     <Compile Include="ViewModels\CartridgeTypesViewVM.cs" />
+    <Compile Include="ViewModels\CatsViewVM.cs" />
+    <Compile Include="ViewModels\CctsViewVM.cs" />
     <Compile Include="ViewModels\ConfigurationsViewVM.cs" />
     <Compile Include="ViewModels\ContactsViewVM.cs" />
     <Compile Include="ViewModels\DbTableViewModel.cs" />
@@ -137,6 +140,18 @@
     <Compile Include="Views\DBViews\ActionTypeView.xaml.cs">
       <DependentUpon>ActionTypeView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\DBViews\CatsView.xaml.cs">
+      <DependentUpon>CatsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\CctsView.xaml.cs">
+      <DependentUpon>CctsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\CatView.xaml.cs">
+      <DependentUpon>CatView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\DBViews\CctView.xaml.cs">
+      <DependentUpon>CctView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\DBViews\RmlView.xaml.cs">
       <DependentUpon>RmlView.xaml</DependentUpon>
     </Compile>
@@ -352,6 +367,22 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\DBViews\CatsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\CctsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\CatView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Views\DBViews\CctView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Views\DBViews\RmlView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
index fa4139389..857f0d3cf 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModelLocator.cs
@@ -55,6 +55,9 @@ namespace Tango.MachineStudio.DB
             SimpleIoc.Default.Register<FiberShapesViewVM>();
             SimpleIoc.Default.Register<FiberSynthsViewVM>();
             SimpleIoc.Default.Register<RmlsViewVM>();
+
+            SimpleIoc.Default.Register<CctsViewVM>();
+            SimpleIoc.Default.Register<CatsViewVM>();
         }
 
         public static MainViewVM MainViewVM
@@ -320,5 +323,21 @@ namespace Tango.MachineStudio.DB
                 return ServiceLocator.Current.GetInstance<RmlsViewVM>();
             }
         }
+
+        public static CctsViewVM CctsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<CctsViewVM>();
+            }
+        }
+
+        public static CatsViewVM CatsViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<CatsViewVM>();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CatsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CatsViewVM.cs
new file mode 100644
index 000000000..74a7e29eb
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CatsViewVM.cs
@@ -0,0 +1,41 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core.Commands;
+using Tango.DAL.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class CatsViewVM : DbTableViewModel<Cat>
+    {
+        public CatsViewVM(INotificationProvider notification) : base(notification)
+        {
+            SelectDataFileCommand = new RelayCommand(SelectDataFile);
+        }
+
+        public RelayCommand SelectDataFileCommand { get; set; }
+
+        private void SelectDataFile()
+        {
+            OpenFileDialog dlg = new OpenFileDialog();
+            dlg.Filter = "Color Adjustment Files|*.CAT";
+            dlg.Title = "Select Color Adjustment File";
+            if (dlg.ShowDialog().Value)
+            {
+                try
+                {
+                    EditEntity.Data = File.ReadAllBytes(dlg.FileName);
+                }
+                catch (Exception ex)
+                {
+                    _notification.ShowError(ex.Message);
+                }
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs
new file mode 100644
index 000000000..02d7c351d
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/CctsViewVM.cs
@@ -0,0 +1,75 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Core.Commands;
+using Tango.DAL.Observables;
+using Tango.MachineStudio.Common.Notifications;
+
+namespace Tango.MachineStudio.DB.ViewModels
+{
+    public class CctsViewVM : DbTableViewModel<Cct>
+    {
+        public CctsViewVM(INotificationProvider notification) : base(notification)
+        {
+            SelectForwardFileCommand = new RelayCommand(SelectForwardFile);
+            SelectInverseFileCommand = new RelayCommand(SelectInverseFile);
+        }
+
+        public RelayCommand SelectForwardFileCommand { get; set; }
+
+        public RelayCommand SelectInverseFileCommand { get; set; }
+
+        private void SelectInverseFile()
+        {
+            String file = SelectFile();
+            if (file != null)
+            {
+                try
+                {
+                    EditEntity.InverseData = File.ReadAllBytes(file);
+                    EditEntity.InverseFileName = Path.GetFileName(file);
+                }
+                catch (Exception ex)
+                {
+                    _notification.ShowError(ex.Message);
+                }
+            }
+        }
+
+        private void SelectForwardFile()
+        {
+            String file = SelectFile();
+            if (file != null)
+            {
+                try
+                {
+                    EditEntity.ForwardData = File.ReadAllBytes(file);
+                    EditEntity.ForwardFileName = Path.GetFileName(file);
+                }
+                catch (Exception ex)
+                {
+                    _notification.ShowError(ex.Message);
+                }
+            }
+        }
+
+        private String SelectFile()
+        {
+            OpenFileDialog dlg = new OpenFileDialog();
+            dlg.Filter = "Color Conversion Files|*.CCT";
+            dlg.Title = "Select Color Conversion File";
+            if (dlg.ShowDialog().Value)
+            {
+                return dlg.FileName;
+            }
+            else
+            {
+                return null;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
index e472e312a..bc8d54ce9 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
@@ -20,7 +20,7 @@ namespace Tango.MachineStudio.DB.ViewModels
 {
     public abstract class DbTableViewModel<T> : ViewModel, IShutdownRequestBlocker where T : class, IObservableEntity
     {
-        private INotificationProvider _notification;
+        protected INotificationProvider _notification;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DbTableViewModel"/> class.
@@ -156,11 +156,11 @@ namespace Tango.MachineStudio.DB.ViewModels
         {
             using (_notification.PushTaskItem("Saving changes to database..."))
             {
-                var  dependenctEntities = SelectedEntity.GetDependentEntitiesNameAndGuid();
+                var dependenctEntities = SelectedEntity.GetDependentEntitiesNameAndGuid();
 
                 if (dependenctEntities.Count > 0)
                 {
-                    _notification.ShowError("The selected entity is being used by " + dependenctEntities.Count + " other entities." + Environment.NewLine + "Please delete any dependencies and try again." + Environment.NewLine + Environment.NewLine + String.Join(Environment.NewLine,dependenctEntities.Select(x => x.Key + ", ID: " + x.Value)));
+                    _notification.ShowError("The selected entity is being used by " + dependenctEntities.Count + " other entities." + Environment.NewLine + "Please delete any dependencies and try again." + Environment.NewLine + Environment.NewLine + String.Join(Environment.NewLine, dependenctEntities.Select(x => x.Key + ", ID: " + x.Value)));
                     return;
                 }
 
@@ -293,18 +293,44 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             collectionView.Filter = (entity) =>
             {
-                return 
-                entity.
-                GetType().
-                GetProperties(BindingFlags.Public | BindingFlags.Instance).
-                Where(x => x.Name != "Deleted" && x.Name != "ID" && x.Name != "LastUpdated").
-                Where(x => !x.PropertyType.IsGenericType && (x.PropertyType.IsClass || x.PropertyType == typeof(String))).
-                Select(prop => prop.GetValue(entity).ToString()).
-                ToList().
-                Any(x => x.ToLower().Contains(filter.ToLower()));
+                return FilterEntity((T)entity, filter);
             };
         }
 
+        private bool FilterEntity(T entity, String filter)
+        {
+            foreach (var prop in entity.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.PropertyType.IsClass && x.PropertyType != typeof(String) && x.PropertyType != typeof(byte[]) && !x.PropertyType.IsGenericType))
+            {
+                object obj = prop.GetValue(entity);
+
+                if (obj != null)
+                {
+                    foreach (var innerProp in obj.GetType().GetProperties(BindingFlags.Public | BindingFlags.Instance).Where(x => x.Name != "Deleted" && x.Name != "ID" && x.Name != "LastUpdated").Where(x => !x.PropertyType.IsGenericType && (x.PropertyType.IsClass || x.PropertyType == typeof(String))))
+                    {
+                        object value = innerProp.GetValue(obj);
+
+                        if (value != null)
+                        {
+                            if (value.ToString().ToLower().Contains(filter.ToLower()))
+                            {
+                                return true;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return
+              entity.
+              GetType().
+              GetProperties(BindingFlags.Public | BindingFlags.Instance).
+              Where(x => x.Name != "Deleted" && x.Name != "ID" && x.Name != "LastUpdated").
+              Where(x => !x.PropertyType.IsGenericType && (x.PropertyType.IsClass || x.PropertyType == typeof(String))).
+              Select(prop => prop.GetValue(entity).ToString()).
+              ToList().
+              Any(x => x.ToLower().Contains(filter.ToLower()));
+        }
+
         protected virtual void InitializeEntity(T entity)
         {
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatView.xaml
new file mode 100644
index 000000000..442f77ae3
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatView.xaml
@@ -0,0 +1,62 @@
+<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.CatView"
+             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:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+              xmlns:localConverters="clr-namespace:Tango.MachineStudio.DB.Converters"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.DB.ViewModels"
+             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
+             mc:Ignorable="d" 
+             d:DesignHeight="400" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=vm:CatsViewVM, IsDesignTimeCreatable=False}">
+
+    <UserControl.Resources>
+        <converters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></converters:ColorToIntegerConverter>
+        <localConverters:ByteArrayToFileSizeConverter x:Key="ByteArrayToFileSizeConverter"></localConverters:ByteArrayToFileSizeConverter>
+    </UserControl.Resources>
+
+    <Grid>
+        <controls:TableGrid>
+            <TextBlock Text="ID:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True"></TextBox>
+            <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True"></TextBox>
+            <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox>
+
+            <TextBlock Text="Liquid Type:" FontWeight="Bold"></TextBlock>
+            <ComboBox ItemsSource="{Binding Adapter.LiquidTypes}" SelectedItem="{Binding EditEntity.LiquidTypes,Mode=TwoWay}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                            <Rectangle Width="16" Height="16" VerticalAlignment="Center">
+                                <Rectangle.Fill>
+                                    <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter}}"></SolidColorBrush>
+                                </Rectangle.Fill>
+                            </Rectangle>
+                            <TextBlock Margin="5 0 0 0" Text="{Binding Name}" VerticalAlignment="Center"></TextBlock>
+                        </StackPanel>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+
+            <TextBlock Text="Machine:" FontWeight="Bold"></TextBlock>
+            <ComboBox ItemsSource="{Binding Adapter.Machines}" SelectedItem="{Binding EditEntity.Machine,Mode=TwoWay}" DisplayMemberPath="SerialNumber"></ComboBox>
+
+            <TextBlock Text="Calibration Data:" FontWeight="Bold"></TextBlock>
+            <DockPanel LastChildFill="False">
+                <TextBlock DockPanel.Dock="Left" Margin="0 0 0 -15" VerticalAlignment="Center" Text="{Binding EditEntity.Data.Length,Converter={StaticResource ByteArrayToFileSizeConverter},TargetNullValue=NONE,FallbackValue=NONE}"></TextBlock>
+                <Button DockPanel.Dock="Right" Margin="0 0 0 -2" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Select File" Padding="5 0 5 0" Command="{Binding SelectDataFileCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock VerticalAlignment="Center">BROWSE</TextBlock>
+                        <materialDesign:PackIcon Margin="5 0 0 0" Kind="FolderOutline" Width="24" Height="24"></materialDesign:PackIcon>
+                    </StackPanel>
+                </Button>
+            </DockPanel>
+        </controls:TableGrid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatView.xaml.cs
new file mode 100644
index 000000000..9e389feb3
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatView.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.DB.Views.DBViews
+{
+    /// <summary>
+    /// Interaction logic for MachineView.xaml
+    /// </summary>
+    public partial class CatView : UserControl
+    {
+        public CatView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml
new file mode 100644
index 000000000..d88a2a142
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml
@@ -0,0 +1,43 @@
+<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.CatsView"
+             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:global="clr-namespace:Tango.MachineStudio.DB"
+             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
+             xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters"
+             xmlns:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" 
+             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.CatsViewVM}">
+
+    <UserControl.Resources>
+        <converters:ByteArrayToFileSizeConverter x:Key="ByteArrayToFileSizeConverter"></converters:ByteArrayToFileSizeConverter>
+        <sharedConverters:ColorToIntegerConverter x:Key="ColorToIntegerConverter"></sharedConverters:ColorToIntegerConverter>
+    </UserControl.Resources>
+
+    <Grid>
+        <controls:DbTableView>
+            <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.CatsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Liquid Type" Binding="{Binding LiquidTypes.Name}"></DataGridTextColumn>
+                    <DataGridTemplateColumn Header="Liquid Type Color">
+                        <DataGridTemplateColumn.CellTemplate>
+                            <DataTemplate>
+                                <Rectangle Width="50">
+                                    <Rectangle.Fill>
+                                        <SolidColorBrush Color="{Binding LiquidTypes.Color,Converter={StaticResource ColorToIntegerConverter},Mode=TwoWay}"></SolidColorBrush>
+                                    </Rectangle.Fill>
+                                </Rectangle>
+                            </DataTemplate>
+                        </DataGridTemplateColumn.CellTemplate>
+                    </DataGridTemplateColumn>
+                    <DataGridTextColumn Header="Machine" Binding="{Binding Machine.SerialNumber}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Calibration Data Size" Binding="{Binding Data.Length,Converter={StaticResource ByteArrayToFileSizeConverter}}"></DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+        </controls:DbTableView>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml.cs
new file mode 100644
index 000000000..ec9dae44f
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CatsView.xaml.cs
@@ -0,0 +1,32 @@
+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;
+using Tango.MachineStudio.DB.CustomAttributes;
+using Tango.MachineStudio.DB.Managers;
+using Tango.SharedUI.Controls;
+
+namespace Tango.MachineStudio.DB.Views.DBViews
+{
+    /// <summary>
+    /// Interaction logic for MachinesView.xaml
+    /// </summary>
+    [DBView]
+    public partial class CatsView : UserControl
+    {
+        public CatsView() : base()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctView.xaml
new file mode 100644
index 000000000..a5bfc2f14
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctView.xaml
@@ -0,0 +1,58 @@
+<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.CctView"
+             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:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.DB.ViewModels"
+             xmlns:local="clr-namespace:Tango.MachineStudio.DB.Views.DBViews"
+             mc:Ignorable="d" 
+             d:DesignHeight="400" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=vm:CctsViewVM, IsDesignTimeCreatable=False}">
+
+    <Grid>
+        <controls:TableGrid>
+            <TextBlock Text="ID:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.ID}" IsReadOnly="True"></TextBox>
+            <TextBlock Text="GUID:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.Guid}" IsReadOnly="True"></TextBox>
+            <TextBlock Text="Last Updated:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.LastUpdated}" IsReadOnly="True"></TextBox>
+            <TextBlock Text="Name:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.Name}"></TextBox>
+            <TextBlock Text="Description:" FontWeight="Bold"></TextBlock>
+            <TextBox Text="{Binding EditEntity.Description}"></TextBox>
+
+            <TextBlock Text="Forward File:" FontWeight="Bold"></TextBlock>
+            <DockPanel LastChildFill="False">
+                <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center" Text="{Binding EditEntity.ForwardFileName,TargetNullValue=NONE}"></TextBlock>
+                <Button DockPanel.Dock="Right" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Select File" Padding="5 0 5 0" Command="{Binding SelectForwardFileCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock VerticalAlignment="Center">BROWSE</TextBlock>
+                        <materialDesign:PackIcon Margin="5 0 0 0" Kind="FolderOutline" Width="24" Height="24"></materialDesign:PackIcon>
+                    </StackPanel>
+                </Button>
+            </DockPanel>
+
+            <TextBlock Text="Inverse File:" FontWeight="Bold"></TextBlock>
+            <DockPanel LastChildFill="False">
+                <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center" Text="{Binding EditEntity.InverseFileName,TargetNullValue=NONE}"></TextBlock>
+                <Button DockPanel.Dock="Right" Style="{StaticResource MaterialDesignFlatButton}" ToolTip="Select File" Padding="5 0 5 0" Command="{Binding SelectInverseFileCommand}">
+                    <StackPanel Orientation="Horizontal">
+                        <TextBlock VerticalAlignment="Center">BROWSE</TextBlock>
+                        <materialDesign:PackIcon Margin="5 0 0 0" Kind="FolderOutline" Width="24" Height="24"></materialDesign:PackIcon>
+                    </StackPanel>
+                </Button>
+            </DockPanel>
+
+            <TextBlock Text="Version:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="10000" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left" Value="{Binding EditEntity.Version,Mode=TwoWay}"></mahapps:NumericUpDown>
+
+            <TextBlock Text="Recommended Media:" FontWeight="Bold"></TextBlock>
+            <ComboBox ItemsSource="{Binding Adapter.Rmls}" SelectedItem="{Binding EditEntity.Rml,Mode=TwoWay}" DisplayMemberPath="Name"></ComboBox>
+        </controls:TableGrid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctView.xaml.cs
new file mode 100644
index 000000000..1a6ee6da7
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctView.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.DB.Views.DBViews
+{
+    /// <summary>
+    /// Interaction logic for MachineView.xaml
+    /// </summary>
+    public partial class CctView : UserControl
+    {
+        public CctView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctsView.xaml
new file mode 100644
index 000000000..09962447c
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctsView.xaml
@@ -0,0 +1,36 @@
+<UserControl x:Class="Tango.MachineStudio.DB.Views.DBViews.CctsView"
+             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:global="clr-namespace:Tango.MachineStudio.DB"
+             xmlns:controls="clr-namespace:Tango.MachineStudio.DB.Controls"
+             xmlns:converters="clr-namespace:Tango.MachineStudio.DB.Converters"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             mc:Ignorable="d" 
+             d:DesignHeight="720" d:DesignWidth="1280" Background="White" DataContext="{x:Static global:ViewModelLocator.CctsViewVM}">
+
+    <UserControl.Resources>
+        <converters:ByteArrayToFileSizeConverter x:Key="ByteArrayToFileSizeConverter"></converters:ByteArrayToFileSizeConverter>
+    </UserControl.Resources>
+    
+    
+    <Grid>
+        <controls:DbTableView>
+            <DataGrid Background="Transparent" ItemsSource="{Binding Adapter.CctsViewSource}" SelectedItem="{Binding SelectedEntity}" AutoGenerateColumns="False" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" IsReadOnly="True">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="ID" Binding="{Binding ID}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="GUID" Binding="{Binding Guid}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Name" Binding="{Binding Name}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Description" Binding="{Binding Description}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Forward File" Binding="{Binding ForwardFileName}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Forward File Size" Binding="{Binding ForwardData.Length,Converter={StaticResource ByteArrayToFileSizeConverter}}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Inverse File" Binding="{Binding InverseFileName}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Inverse File Size" Binding="{Binding InverseData.Length,Converter={StaticResource ByteArrayToFileSizeConverter}}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="Version" Binding="{Binding Version}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="RML" Binding="{Binding Rml.Name}"></DataGridTextColumn>
+                </DataGrid.Columns>
+            </DataGrid>
+        </controls:DbTableView>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctsView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctsView.xaml.cs
new file mode 100644
index 000000000..fa4d80bd2
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/CctsView.xaml.cs
@@ -0,0 +1,32 @@
+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;
+using Tango.MachineStudio.DB.CustomAttributes;
+using Tango.MachineStudio.DB.Managers;
+using Tango.SharedUI.Controls;
+
+namespace Tango.MachineStudio.DB.Views.DBViews
+{
+    /// <summary>
+    /// Interaction logic for MachinesView.xaml
+    /// </summary>
+    [DBView]
+    public partial class CctsView : UserControl
+    {
+        public CctsView() : base()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs
index d7e641735..43b57bef3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/ViewModels/MainViewVM.cs
@@ -412,7 +412,7 @@ namespace Tango.MachineStudio.Stubs.ViewModels
         {
             if (UseConnectedMachine && !ApplicationManager.IsMachineConnected)
             {
-                _notification.ShowError("Cannot execute stub while 'Connected Machine' is set but not machine connected.");
+                _notification.ShowError("Cannot execute stub while 'Connected Machine' is set but no machine connected.");
                 return;
             }
 
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CAT.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CAT.cs
new file mode 100644
index 000000000..c46de78a5
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/CAT.cs
@@ -0,0 +1,25 @@
+//------------------------------------------------------------------------------
+// <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.Local.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class CAT
+    {
+        public long ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public bool DELETED { get; set; }
+        public string LIQUID_TYPE_GUID { get; set; }
+        public string MACHINE_GUID { get; set; }
+        public byte[] DATA { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/CCT.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/CCT.cs
new file mode 100644
index 000000000..fc71ebf27
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/CCT.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <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.Local.DB
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class CCT
+    {
+        public long ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public bool DELETED { get; set; }
+        public string NAME { get; set; }
+        public string DESCRIPTION { get; set; }
+        public string FORWARD_FILE_NAME { get; set; }
+        public string INVERSE_FILE_NAME { get; set; }
+        public byte[] FORWARD_DATA { get; set; }
+        public byte[] INVERSE_DATA { get; set; }
+        public double VERSION { get; set; }
+        public string RML_GUID { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs
index 41fedc263..dc77b198b 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/DISPENSER.cs
@@ -18,6 +18,7 @@ namespace Tango.DAL.Local.DB
         public string GUID { get; set; }
         public System.DateTime LAST_UPDATED { get; set; }
         public bool DELETED { get; set; }
+        public string SERIAL_NUMBER { get; set; }
         public string DISPENSER_TYPE_GUID { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
index 24df1c1ce..5577ba99f 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.Context.cs
@@ -33,6 +33,8 @@ namespace Tango.DAL.Local.DB
         public virtual DbSet<APPLICATION_VERSIONS> APPLICATION_VERSIONS { get; set; }
         public virtual DbSet<CARTRIDGE_TYPES> CARTRIDGE_TYPES { get; set; }
         public virtual DbSet<CARTRIDGE> CARTRIDGES { get; set; }
+        public virtual DbSet<CAT> CATS { get; set; }
+        public virtual DbSet<CCT> CCTS { get; set; }
         public virtual DbSet<CONFIGURATION> CONFIGURATIONS { get; set; }
         public virtual DbSet<CONTACT> CONTACTS { get; set; }
         public virtual DbSet<DISPENSER_TYPES> DISPENSER_TYPES { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
index 4bd90ccea..444822fe1 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx
@@ -98,6 +98,35 @@
           <Property Name="DELETED" Type="bit" Nullable="false" />
           <Property Name="CARTRIDGE_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
+        <EntityType Name="CATS">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="integer" Nullable="false" />
+          <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
+          <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="LIQUID_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="MACHINE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="DATA" Type="blob" Nullable="false" />
+        </EntityType>
+        <EntityType Name="CCTS">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="integer" Nullable="false" />
+          <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
+          <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="FORWARD_FILE_NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="INVERSE_FILE_NAME" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+          <Property Name="FORWARD_DATA" Type="blob" Nullable="false" />
+          <Property Name="INVERSE_DATA" Type="blob" Nullable="false" />
+          <Property Name="VERSION" Type="real" Nullable="false" />
+          <Property Name="RML_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
+        </EntityType>
         <EntityType Name="CONFIGURATIONS">
           <Key>
             <PropertyRef Name="ID" />
@@ -150,6 +179,7 @@
           <Property Name="GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="LAST_UPDATED" Type="datetime" Nullable="false" />
           <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="SERIAL_NUMBER" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
           <Property Name="DISPENSER_TYPE_GUID" Type="nvarchar" MaxLength="2147483647" Nullable="false" />
         </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
@@ -478,6 +508,8 @@
           <EntitySet Name="APPLICATION_VERSIONS" EntityType="Self.APPLICATION_VERSIONS" store:Type="Tables" />
           <EntitySet Name="CARTRIDGE_TYPES" EntityType="Self.CARTRIDGE_TYPES" store:Type="Tables" />
           <EntitySet Name="CARTRIDGES" EntityType="Self.CARTRIDGES" store:Type="Tables" />
+          <EntitySet Name="CATS" EntityType="Self.CATS" store:Type="Tables" />
+          <EntitySet Name="CCTS" EntityType="Self.CCTS" store:Type="Tables" />
           <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATIONS" store:Type="Tables" />
           <EntitySet Name="CONTACTS" EntityType="Self.CONTACTS" store:Type="Tables" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="Self.DISPENSER_TYPES" store:Type="Tables" />
@@ -523,6 +555,8 @@
           <EntitySet Name="APPLICATION_VERSIONS" EntityType="LocalModel.APPLICATION_VERSIONS" />
           <EntitySet Name="CARTRIDGE_TYPES" EntityType="LocalModel.CARTRIDGE_TYPES" />
           <EntitySet Name="CARTRIDGES" EntityType="LocalModel.CARTRIDGE" />
+          <EntitySet Name="CATS" EntityType="LocalModel.CAT" />
+          <EntitySet Name="CCTS" EntityType="LocalModel.CCT" />
           <EntitySet Name="CONFIGURATIONS" EntityType="LocalModel.CONFIGURATION" />
           <EntitySet Name="CONTACTS" EntityType="LocalModel.CONTACT" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="LocalModel.DISPENSER_TYPES" />
@@ -648,6 +682,35 @@
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
           <Property Name="CARTRIDGE_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
+        <EntityType Name="CAT">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="Int64" Nullable="false" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
+          <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="DATA" Type="Binary" Nullable="false" MaxLength="2147483647" FixedLength="false" />
+        </EntityType>
+        <EntityType Name="CCT">
+          <Key>
+            <PropertyRef Name="ID" />
+          </Key>
+          <Property Name="ID" Type="Int64" Nullable="false" />
+          <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
+          <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="FORWARD_FILE_NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="INVERSE_FILE_NAME" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+          <Property Name="FORWARD_DATA" Type="Binary" Nullable="false" MaxLength="2147483647" FixedLength="false" />
+          <Property Name="INVERSE_DATA" Type="Binary" Nullable="false" MaxLength="2147483647" FixedLength="false" />
+          <Property Name="VERSION" Type="Double" Nullable="false" />
+          <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
+        </EntityType>
         <EntityType Name="CONFIGURATION">
           <Key>
             <PropertyRef Name="ID" />
@@ -700,6 +763,7 @@
           <Property Name="GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="LAST_UPDATED" Type="DateTime" Nullable="false" />
           <Property Name="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="SERIAL_NUMBER" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
           <Property Name="DISPENSER_TYPE_GUID" Type="String" Nullable="false" MaxLength="2147483647" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="EMBEDDED_FIRMWARE_VERSIONS">
@@ -1126,6 +1190,37 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="CATS">
+            <EntityTypeMapping TypeName="LocalModel.CAT">
+              <MappingFragment StoreEntitySet="CATS">
+                <ScalarProperty Name="DATA" ColumnName="DATA" />
+                <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" />
+                <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" />
+                <ScalarProperty Name="DELETED" ColumnName="DELETED" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="CCTS">
+            <EntityTypeMapping TypeName="LocalModel.CCT">
+              <MappingFragment StoreEntitySet="CCTS">
+                <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
+                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
+                <ScalarProperty Name="INVERSE_DATA" ColumnName="INVERSE_DATA" />
+                <ScalarProperty Name="FORWARD_DATA" ColumnName="FORWARD_DATA" />
+                <ScalarProperty Name="INVERSE_FILE_NAME" ColumnName="INVERSE_FILE_NAME" />
+                <ScalarProperty Name="FORWARD_FILE_NAME" ColumnName="FORWARD_FILE_NAME" />
+                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="DELETED" ColumnName="DELETED" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="CONFIGURATIONS">
             <EntityTypeMapping TypeName="LocalModel.CONFIGURATION">
               <MappingFragment StoreEntitySet="CONFIGURATIONS">
@@ -1177,6 +1272,7 @@
             <EntityTypeMapping TypeName="LocalModel.DISPENSER">
               <MappingFragment StoreEntitySet="DISPENSERS">
                 <ScalarProperty Name="DISPENSER_TYPE_GUID" ColumnName="DISPENSER_TYPE_GUID" />
+                <ScalarProperty Name="SERIAL_NUMBER" ColumnName="SERIAL_NUMBER" />
                 <ScalarProperty Name="DELETED" ColumnName="DELETED" />
                 <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
                 <ScalarProperty Name="GUID" ColumnName="GUID" />
diff --git a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
index f36a25560..f9884e5ba 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Local/DB/LocalADO.edmx.diagram
@@ -13,37 +13,39 @@
         <EntityTypeShape EntityType="LocalModel.APPLICATION_VERSIONS" Width="1.5" PointX="4.75" PointY="3.75" />
         <EntityTypeShape EntityType="LocalModel.CARTRIDGE_TYPES" Width="1.5" PointX="6.75" PointY="0.75" />
         <EntityTypeShape EntityType="LocalModel.CARTRIDGE" Width="1.5" PointX="6.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="4.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="6.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.DISPENSER" Width="1.5" PointX="8.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="8.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES" Width="1.5" PointX="8.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHS" Width="1.5" PointX="10.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="10.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="10.75" PointY="9.75" />
-        <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="2.75" PointY="11.75" />
-        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="4.75" PointY="11.75" />
-        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="12.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="12.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="12.75" PointY="7.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="12.75" PointY="11.75" />
-        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="6.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="8.75" PointY="13.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="14.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="14.75" PointY="3.75" />
-        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="14.75" PointY="6.75" />
-        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="14.75" PointY="10.75" />
-        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="10.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="12.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.75" PointY="14.75" />
-        <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="2.75" PointY="15.75" />
-        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="16.75" PointY="0.75" />
-        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="16.75" PointY="4.75" />
+        <EntityTypeShape EntityType="LocalModel.CAT" Width="1.5" PointX="4.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.CCT" Width="1.5" PointX="6.75" PointY="6.75" />
+        <EntityTypeShape EntityType="LocalModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.CONTACT" Width="1.5" PointX="8.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.DISPENSER_TYPES" Width="1.5" PointX="8.75" PointY="4.75" />
+        <EntityTypeShape EntityType="LocalModel.DISPENSER" Width="1.5" PointX="8.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="10.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="2.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES" Width="1.5" PointX="10.75" PointY="3.75" />
+        <EntityTypeShape EntityType="LocalModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="10.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SHAPES" Width="1.5" PointX="8.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.FIBER_SYNTHS" Width="1.5" PointX="10.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.75" PointY="11.75" />
+        <EntityTypeShape EntityType="LocalModel.IDS_PACKS" Width="1.5" PointX="12.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="12.75" PointY="4.75" />
+        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES" Width="1.5" PointX="12.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="12.75" PointY="11.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINE" Width="1.5" PointX="6.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="8.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.MACHINES_EVENTS" Width="1.5" PointX="14.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_COLORS" Width="1.5" PointX="2.75" PointY="14.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_CONDITIONS" Width="1.5" PointX="14.75" PointY="4.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_MATERIALS" Width="1.5" PointX="14.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.MEDIA_PURPOSES" Width="1.5" PointX="14.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.ORGANIZATION" Width="1.5" PointX="10.75" PointY="14.75" />
+        <EntityTypeShape EntityType="LocalModel.PERMISSION" Width="1.5" PointX="12.75" PointY="14.75" />
+        <EntityTypeShape EntityType="LocalModel.RML" Width="1.5" PointX="14.75" PointY="13.75" />
+        <EntityTypeShape EntityType="LocalModel.ROLE" Width="1.5" PointX="16.75" PointY="0.75" />
+        <EntityTypeShape EntityType="LocalModel.ROLES_PERMISSIONS" Width="1.5" PointX="16.75" PointY="4.75" />
+        <EntityTypeShape EntityType="LocalModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="16.75" PointY="7.75" />
+        <EntityTypeShape EntityType="LocalModel.USER" Width="1.5" PointX="16.75" PointY="10.75" />
+        <EntityTypeShape EntityType="LocalModel.USERS_ROLES" Width="1.5" PointX="16.75" PointY="14.75" />
       </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>
diff --git a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
index b37074e7f..16e1101a7 100644
--- a/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Local/Tango.DAL.Local.csproj
@@ -89,6 +89,12 @@
     <Compile Include="DB\CARTRIDGE_TYPES.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\CAT.cs">
+      <DependentUpon>LocalADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\CCT.cs">
+      <DependentUpon>LocalADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\CONFIGURATION.cs">
       <DependentUpon>LocalADO.tt</DependentUpon>
     </Compile>
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cat.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cat.cs
new file mode 100644
index 000000000..c179af8f3
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cat.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Observables
+{
+    [EntityFieldName("CATS")]
+    public class Cat : ObservableEntity<CAT>
+    {
+
+        private String _liquidtypeguid;
+        /// <summary>
+        /// Gets or sets the cat liquid type guid.
+        /// </summary>
+        [EntityFieldName("LIQUID_TYPE_GUID")]
+        public String LiquidTypeGuid
+        {
+            get 
+            {
+                return _liquidtypeguid; 
+            }
+
+            set 
+            {
+                _liquidtypeguid = value; RaisePropertyChanged(nameof(LiquidTypeGuid)); 
+            }
+
+        }
+
+        private String _machineguid;
+        /// <summary>
+        /// Gets or sets the cat machine guid.
+        /// </summary>
+        [EntityFieldName("MACHINE_GUID")]
+        public String MachineGuid
+        {
+            get 
+            {
+                return _machineguid; 
+            }
+
+            set 
+            {
+                _machineguid = value; RaisePropertyChanged(nameof(MachineGuid)); 
+            }
+
+        }
+
+        private Byte[] _data;
+        /// <summary>
+        /// Gets or sets the cat data.
+        /// </summary>
+        [EntityFieldName("DATA")]
+        public Byte[] Data
+        {
+            get 
+            {
+                return _data; 
+            }
+
+            set 
+            {
+                _data = value; RaisePropertyChanged(nameof(Data)); 
+            }
+
+        }
+
+        private LiquidType _liquidtypes;
+        /// <summary>
+        /// Gets or sets the cat liquid types.
+        /// </summary>
+        [EntityFieldName("LIQUID_TYPES")]
+        public LiquidType LiquidTypes
+        {
+            get 
+            {
+                return _liquidtypes; 
+            }
+
+            set 
+            {
+                _liquidtypes = value; RaisePropertyChanged(nameof(LiquidTypes)); 
+            }
+
+        }
+
+        private Machine _machine;
+        /// <summary>
+        /// Gets or sets the cat machine.
+        /// </summary>
+        [EntityFieldName("MACHINE")]
+        public Machine Machine
+        {
+            get 
+            {
+                return _machine; 
+            }
+
+            set 
+            {
+                _machine = value; RaisePropertyChanged(nameof(Machine)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Cat" /> class.
+        /// </summary>
+        public Cat() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Cat" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Cat(CAT entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cct.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cct.cs
new file mode 100644
index 000000000..412cbbb1c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Cct.cs
@@ -0,0 +1,209 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using Tango.DAL.Remote.DB;
+
+namespace Tango.DAL.Observables
+{
+    [EntityFieldName("CCTS")]
+    public class Cct : ObservableEntity<CCT>
+    {
+
+        private String _name;
+        /// <summary>
+        /// Gets or sets the cct name.
+        /// </summary>
+        [EntityFieldName("NAME")]
+        public String Name
+        {
+            get 
+            {
+                return _name; 
+            }
+
+            set 
+            {
+                _name = value; RaisePropertyChanged(nameof(Name)); 
+            }
+
+        }
+
+        private String _description;
+        /// <summary>
+        /// Gets or sets the cct description.
+        /// </summary>
+        [EntityFieldName("DESCRIPTION")]
+        public String Description
+        {
+            get 
+            {
+                return _description; 
+            }
+
+            set 
+            {
+                _description = value; RaisePropertyChanged(nameof(Description)); 
+            }
+
+        }
+
+        private String _forwardfilename;
+        /// <summary>
+        /// Gets or sets the cct forward file name.
+        /// </summary>
+        [EntityFieldName("FORWARD_FILE_NAME")]
+        public String ForwardFileName
+        {
+            get 
+            {
+                return _forwardfilename; 
+            }
+
+            set 
+            {
+                _forwardfilename = value; RaisePropertyChanged(nameof(ForwardFileName)); 
+            }
+
+        }
+
+        private String _inversefilename;
+        /// <summary>
+        /// Gets or sets the cct inverse file name.
+        /// </summary>
+        [EntityFieldName("INVERSE_FILE_NAME")]
+        public String InverseFileName
+        {
+            get 
+            {
+                return _inversefilename; 
+            }
+
+            set 
+            {
+                _inversefilename = value; RaisePropertyChanged(nameof(InverseFileName)); 
+            }
+
+        }
+
+        private Byte[] _forwarddata;
+        /// <summary>
+        /// Gets or sets the cct forward data.
+        /// </summary>
+        [EntityFieldName("FORWARD_DATA")]
+        public Byte[] ForwardData
+        {
+            get 
+            {
+                return _forwarddata; 
+            }
+
+            set 
+            {
+                _forwarddata = value; RaisePropertyChanged(nameof(ForwardData)); 
+            }
+
+        }
+
+        private Byte[] _inversedata;
+        /// <summary>
+        /// Gets or sets the cct inverse data.
+        /// </summary>
+        [EntityFieldName("INVERSE_DATA")]
+        public Byte[] InverseData
+        {
+            get 
+            {
+                return _inversedata; 
+            }
+
+            set 
+            {
+                _inversedata = value; RaisePropertyChanged(nameof(InverseData)); 
+            }
+
+        }
+
+        private Double _version;
+        /// <summary>
+        /// Gets or sets the cct version.
+        /// </summary>
+        [EntityFieldName("VERSION")]
+        public Double Version
+        {
+            get 
+            {
+                return _version; 
+            }
+
+            set 
+            {
+                _version = value; RaisePropertyChanged(nameof(Version)); 
+            }
+
+        }
+
+        private String _rmlguid;
+        /// <summary>
+        /// Gets or sets the cct rml guid.
+        /// </summary>
+        [EntityFieldName("RML_GUID")]
+        public String RmlGuid
+        {
+            get 
+            {
+                return _rmlguid; 
+            }
+
+            set 
+            {
+                _rmlguid = value; RaisePropertyChanged(nameof(RmlGuid)); 
+            }
+
+        }
+
+        private Rml _rml;
+        /// <summary>
+        /// Gets or sets the cct rml.
+        /// </summary>
+        [EntityFieldName("RML")]
+        public Rml Rml
+        {
+            get 
+            {
+                return _rml; 
+            }
+
+            set 
+            {
+                _rml = value; RaisePropertyChanged(nameof(Rml)); 
+            }
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Cct" /> class.
+        /// </summary>
+        public Cct() : base()
+        {
+            Init();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Cct" /> class.
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        public Cct(CCT entity) : base(entity)
+        {
+            Init();
+            MapEntityToObservable(entity, this);
+        }
+
+        /// <summary>
+        /// Initialize complex types.
+        /// </summary>
+        private void Init()
+        {
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs
index 613d6a739..c558e227d 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/LiquidType.cs
@@ -86,6 +86,25 @@ namespace Tango.DAL.Observables
 
         }
 
+        private ObservableCollection<Cat> _cats;
+        /// <summary>
+        /// Gets or sets the liquidtype cats.
+        /// </summary>
+        [EntityFieldName("CATS")]
+        public ObservableCollection<Cat> Cats
+        {
+            get 
+            {
+                return _cats; 
+            }
+
+            set 
+            {
+                _cats = value; RaisePropertyChanged(nameof(Cats)); 
+            }
+
+        }
+
         private ObservableCollection<IdsPack> _idspacks;
         /// <summary>
         /// Gets or sets the liquidtype ids packs.
@@ -148,6 +167,8 @@ namespace Tango.DAL.Observables
         private void Init()
         {
 
+            Cats = new ObservableCollection<Cat>();
+
             IdsPacks = new ObservableCollection<IdsPack>();
 
             LiquidTypesRmls = new ObservableCollection<LiquidTypesRml>();
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Machine.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Machine.cs
index ec946a15a..40d191c67 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Machine.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Machine.cs
@@ -124,6 +124,25 @@ namespace Tango.DAL.Observables
 
         }
 
+        private ObservableCollection<Cat> _cats;
+        /// <summary>
+        /// Gets or sets the machine cats.
+        /// </summary>
+        [EntityFieldName("CATS")]
+        public ObservableCollection<Cat> Cats
+        {
+            get 
+            {
+                return _cats; 
+            }
+
+            set 
+            {
+                _cats = value; RaisePropertyChanged(nameof(Cats)); 
+            }
+
+        }
+
         private Configuration _configuration;
         /// <summary>
         /// Gets or sets the machine configuration.
@@ -243,6 +262,8 @@ namespace Tango.DAL.Observables
         private void Init()
         {
 
+            Cats = new ObservableCollection<Cat>();
+
             MachinesConfigurations = new ObservableCollection<MachinesConfiguration>();
 
             MachinesEvents = new ObservableCollection<MachinesEvent>();
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs
index b0f85c1ab..e1811d5e4 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Entities/Rml.cs
@@ -371,6 +371,25 @@ namespace Tango.DAL.Observables
 
         }
 
+        private ObservableCollection<Cct> _ccts;
+        /// <summary>
+        /// Gets or sets the rml ccts.
+        /// </summary>
+        [EntityFieldName("CCTS")]
+        public ObservableCollection<Cct> Ccts
+        {
+            get 
+            {
+                return _ccts; 
+            }
+
+            set 
+            {
+                _ccts = value; RaisePropertyChanged(nameof(Ccts)); 
+            }
+
+        }
+
         private FiberShape _fibershapes;
         /// <summary>
         /// Gets or sets the rml fiber shapes.
@@ -547,6 +566,8 @@ namespace Tango.DAL.Observables
         private void Init()
         {
 
+            Ccts = new ObservableCollection<Cct>();
+
             LiquidTypesRmls = new ObservableCollection<LiquidTypesRml>();
 
         }
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs
index 74bcfbb83..56455246f 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservableEntity.cs
@@ -70,7 +70,7 @@ namespace Tango.DAL.Observables
                         }
                     }
                 }
-                else if (prop.PropertyType.IsClass && prop.PropertyType != typeof(String) && prop.PropertyType != typeof(DateTime))
+                else if (prop.PropertyType.IsClass && prop.PropertyType != typeof(String) && prop.PropertyType != typeof(DateTime) && prop.PropertyType != typeof(byte[]))
                 {
                     Type propType = observable.GetType().GetProperty(name).PropertyType;
 
@@ -244,7 +244,7 @@ namespace Tango.DAL.Observables
 
             //Match guids..
 
-            foreach (var prop in this.GetType().GetProperties().Where(x => !x.PropertyType.IsGenericType && x.PropertyType.IsClass && x.PropertyType != typeof(String) && x.PropertyType != typeof(DateTime)))
+            foreach (var prop in this.GetType().GetProperties().Where(x => !x.PropertyType.IsGenericType && x.PropertyType.IsClass && x.PropertyType != typeof(String) && x.PropertyType != typeof(DateTime) && x.PropertyType != typeof(byte[])))
             {
                 IObservableEntity propObservable = prop.GetValue(this) as IObservableEntity;
 
@@ -286,7 +286,7 @@ namespace Tango.DAL.Observables
                             }
                         }
                     }
-                    else if (prop.PropertyType.IsClass && prop.PropertyType != typeof(String) && prop.PropertyType != typeof(DateTime))
+                    else if (prop.PropertyType.IsClass && prop.PropertyType != typeof(String) && prop.PropertyType != typeof(DateTime) && prop.PropertyType != typeof(byte[]))
                     {
                         var item = (prop.GetValue(this) as ObservableEntity);
                         if (!savedEntities.Contains(item))
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs
index 63fdce62a..e4baa31c9 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapter.cs
@@ -145,6 +145,10 @@ namespace Tango.DAL.Observables
 
             Rmls = Context.RMLS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<Rml>(x)).ToObservableCollection();
 
+            Ccts = Context.CCTS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<Cct>(x)).ToObservableCollection();
+
+            Cats = Context.CATS.Where(x => !x.DELETED).ToList().Select(x => ObservableEntity.CreateObservableFromEntity<Cat>(x)).ToObservableCollection();
+
             InitCollectionSources();
         }
 
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs
index 8b17c1182..d5d687d46 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs
+++ b/Software/Visual_Studio/Tango.DAL.Observables/ObservablesEntitiesAdapterExtension.cs
@@ -294,6 +294,78 @@ namespace Tango.DAL.Observables
 
         }
 
+        private ObservableCollection<Cat> _cats;
+        /// <summary>
+        /// Gets or sets the Cats.
+        /// </summary>
+        public ObservableCollection<Cat> Cats
+        {
+            get 
+            {
+                return _cats; 
+            }
+
+            set 
+            {
+                _cats = value; RaisePropertyChanged(nameof(Cats)); 
+            }
+
+        }
+
+        private ICollectionView _catsViewSource;
+        /// <summary>
+        /// Gets or sets the Cats View Source.
+        ///</summary>
+        public ICollectionView CatsViewSource
+        {
+            get 
+            {
+                return _catsViewSource; 
+            }
+
+            set 
+            {
+                _catsViewSource = value; RaisePropertyChanged(nameof(CatsViewSource)); 
+            }
+
+        }
+
+        private ObservableCollection<Cct> _ccts;
+        /// <summary>
+        /// Gets or sets the Ccts.
+        /// </summary>
+        public ObservableCollection<Cct> Ccts
+        {
+            get 
+            {
+                return _ccts; 
+            }
+
+            set 
+            {
+                _ccts = value; RaisePropertyChanged(nameof(Ccts)); 
+            }
+
+        }
+
+        private ICollectionView _cctsViewSource;
+        /// <summary>
+        /// Gets or sets the Ccts View Source.
+        ///</summary>
+        public ICollectionView CctsViewSource
+        {
+            get 
+            {
+                return _cctsViewSource; 
+            }
+
+            set 
+            {
+                _cctsViewSource = value; RaisePropertyChanged(nameof(CctsViewSource)); 
+            }
+
+        }
+
         private ObservableCollection<Configuration> _configurations;
         /// <summary>
         /// Gets or sets the Configurations.
@@ -1432,6 +1504,10 @@ namespace Tango.DAL.Observables
 
             CartridgesViewSource = CreateCollectionView(Cartridges);
 
+            CatsViewSource = CreateCollectionView(Cats);
+
+            CctsViewSource = CreateCollectionView(Ccts);
+
             ConfigurationsViewSource = CreateCollectionView(Configurations);
 
             ContactsViewSource = CreateCollectionView(Contacts);
diff --git a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj
index 096b12d91..5912b99ea 100644
--- a/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Observables/Tango.DAL.Observables.csproj
@@ -57,6 +57,8 @@
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
     <Compile Include="Entities\ActionType.cs" />
+    <Compile Include="Entities\Cat.cs" />
+    <Compile Include="Entities\Cct.cs" />
     <Compile Include="Entities\EventType.cs" />
     <Compile Include="Entities\EventTypesAction.cs" />
     <Compile Include="Entities\FiberSynth.cs" />
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CAT.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CAT.cs
new file mode 100644
index 000000000..162c39209
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CAT.cs
@@ -0,0 +1,28 @@
+//------------------------------------------------------------------------------
+// <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 CAT
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public bool DELETED { get; set; }
+        public string LIQUID_TYPE_GUID { get; set; }
+        public string MACHINE_GUID { get; set; }
+        public byte[] DATA { get; set; }
+    
+        public virtual LIQUID_TYPES LIQUID_TYPES { get; set; }
+        public virtual MACHINE MACHINE { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs
new file mode 100644
index 000000000..9a420020b
--- /dev/null
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/CCT.cs
@@ -0,0 +1,32 @@
+//------------------------------------------------------------------------------
+// <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 CCT
+    {
+        public int ID { get; set; }
+        public string GUID { get; set; }
+        public System.DateTime LAST_UPDATED { get; set; }
+        public bool DELETED { get; set; }
+        public string NAME { get; set; }
+        public string DESCRIPTION { get; set; }
+        public string FORWARD_FILE_NAME { get; set; }
+        public string INVERSE_FILE_NAME { get; set; }
+        public byte[] FORWARD_DATA { get; set; }
+        public byte[] INVERSE_DATA { get; set; }
+        public double VERSION { get; set; }
+        public string RML_GUID { get; set; }
+    
+        public virtual RML RML { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
index 13821ad8d..71f55585b 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/LIQUID_TYPES.cs
@@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public LIQUID_TYPES()
         {
+            this.CATS = new HashSet<CAT>();
             this.IDS_PACKS = new HashSet<IDS_PACKS>();
             this.LIQUID_TYPES_RMLS = new HashSet<LIQUID_TYPES_RMLS>();
         }
@@ -30,6 +31,8 @@ namespace Tango.DAL.Remote.DB
         public double VERSION { get; set; }
         public int COLOR { get; set; }
     
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<CAT> CATS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
         public virtual ICollection<IDS_PACKS> IDS_PACKS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
index 927397513..bd54bbf4a 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/MACHINE.cs
@@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public MACHINE()
         {
+            this.CATS = new HashSet<CAT>();
             this.MACHINES_CONFIGURATIONS = new HashSet<MACHINES_CONFIGURATIONS>();
             this.MACHINES_EVENTS = new HashSet<MACHINES_EVENTS>();
         }
@@ -32,6 +33,8 @@ namespace Tango.DAL.Remote.DB
         public string MACHINE_VERSION_GUID { get; set; }
         public string CONFIGURATION_GUID { get; set; }
     
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<CAT> CATS { get; set; }
         public virtual CONFIGURATION CONFIGURATION { get; set; }
         public virtual MACHINE_VERSIONS MACHINE_VERSIONS { get; set; }
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
index 6c681437f..ab1189e95 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RML.cs
@@ -17,6 +17,7 @@ namespace Tango.DAL.Remote.DB
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
         public RML()
         {
+            this.CCTS = new HashSet<CCT>();
             this.LIQUID_TYPES_RMLS = new HashSet<LIQUID_TYPES_RMLS>();
         }
     
@@ -44,6 +45,8 @@ namespace Tango.DAL.Remote.DB
         public double ELONGATION_AT_BREAK_PERCENTAGE { get; set; }
         public double ESTIMATED_THREAD_DIAMETER { get; set; }
     
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
+        public virtual ICollection<CCT> CCTS { get; set; }
         public virtual FIBER_SHAPES FIBER_SHAPES { get; set; }
         public virtual FIBER_SYNTHS FIBER_SYNTHS { get; set; }
         public virtual LINEAR_MASS_DENSITY_UNITS LINEAR_MASS_DENSITY_UNITS { get; set; }
diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
index 7af957ce4..a04261d6a 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.Context.cs
@@ -33,6 +33,8 @@ namespace Tango.DAL.Remote.DB
         public virtual DbSet<APPLICATION_VERSIONS> APPLICATION_VERSIONS { get; set; }
         public virtual DbSet<CARTRIDGE_TYPES> CARTRIDGE_TYPES { get; set; }
         public virtual DbSet<CARTRIDGE> CARTRIDGES { get; set; }
+        public virtual DbSet<CAT> CATS { get; set; }
+        public virtual DbSet<CCT> CCTS { get; set; }
         public virtual DbSet<CONFIGURATION> CONFIGURATIONS { get; set; }
         public virtual DbSet<CONTACT> CONTACTS { get; set; }
         public virtual DbSet<DISPENSER_TYPES> DISPENSER_TYPES { 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 4cc5f3b22..7e82dbbe3 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx
@@ -99,6 +99,35 @@
           <Property Name="SERIAL_NUMBER" Type="nvarchar" MaxLength="50" Nullable="false" />
           <Property Name="CARTRIDGE_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
         </EntityType>
+        <EntityType Name="CATS">
+          <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="datetime" Nullable="false" />
+          <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="LIQUID_TYPE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="MACHINE_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+          <Property Name="DATA" Type="image" Nullable="false" />
+        </EntityType>
+        <EntityType Name="CCTS">
+          <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="datetime" Nullable="false" />
+          <Property Name="DELETED" Type="bit" Nullable="false" />
+          <Property Name="NAME" Type="nvarchar" MaxLength="100" Nullable="false" />
+          <Property Name="DESCRIPTION" Type="nvarchar" MaxLength="200" Nullable="false" />
+          <Property Name="FORWARD_FILE_NAME" Type="nvarchar" MaxLength="100" Nullable="false" />
+          <Property Name="INVERSE_FILE_NAME" Type="nvarchar" MaxLength="100" Nullable="false" />
+          <Property Name="FORWARD_DATA" Type="image" Nullable="false" />
+          <Property Name="INVERSE_DATA" Type="image" Nullable="false" />
+          <Property Name="VERSION" Type="float" Nullable="false" />
+          <Property Name="RML_GUID" Type="varchar" MaxLength="36" Nullable="false" />
+        </EntityType>
         <EntityType Name="CONFIGURATIONS">
           <Key>
             <PropertyRef Name="GUID" />
@@ -496,6 +525,42 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_CATS_LIQUID_TYPES">
+          <End Role="LIQUID_TYPES" Type="Self.LIQUID_TYPES" Multiplicity="1" />
+          <End Role="CATS" Type="Self.CATS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="LIQUID_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="CATS">
+              <PropertyRef Name="LIQUID_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_CATS_MACHINES">
+          <End Role="MACHINES" Type="Self.MACHINES" Multiplicity="1" />
+          <End Role="CATS" Type="Self.CATS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="MACHINES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="CATS">
+              <PropertyRef Name="MACHINE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_CCTS_RMLS">
+          <End Role="RMLS" Type="Self.RMLS" Multiplicity="1" />
+          <End Role="CCTS" Type="Self.CCTS" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RMLS">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="CCTS">
+              <PropertyRef Name="RML_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS">
           <End Role="APPLICATION_DISPLAY_PANEL_VERSIONS" Type="Self.APPLICATION_DISPLAY_PANEL_VERSIONS" Multiplicity="1" />
           <End Role="CONFIGURATIONS" Type="Self.CONFIGURATIONS" Multiplicity="*" />
@@ -1007,6 +1072,8 @@
           <EntitySet Name="APPLICATION_VERSIONS" EntityType="Self.APPLICATION_VERSIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CARTRIDGE_TYPES" EntityType="Self.CARTRIDGE_TYPES" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CARTRIDGES" EntityType="Self.CARTRIDGES" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="CATS" EntityType="Self.CATS" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="CCTS" EntityType="Self.CCTS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CONFIGURATIONS" EntityType="Self.CONFIGURATIONS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="CONTACTS" EntityType="Self.CONTACTS" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="Self.DISPENSER_TYPES" Schema="dbo" store:Type="Tables" />
@@ -1042,6 +1109,18 @@
             <End Role="CARTRIDGE_TYPES" EntitySet="CARTRIDGE_TYPES" />
             <End Role="CARTRIDGES" EntitySet="CARTRIDGES" />
           </AssociationSet>
+          <AssociationSet Name="FK_CATS_LIQUID_TYPES" Association="Self.FK_CATS_LIQUID_TYPES">
+            <End Role="LIQUID_TYPES" EntitySet="LIQUID_TYPES" />
+            <End Role="CATS" EntitySet="CATS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_CATS_MACHINES" Association="Self.FK_CATS_MACHINES">
+            <End Role="MACHINES" EntitySet="MACHINES" />
+            <End Role="CATS" EntitySet="CATS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_CCTS_RMLS" Association="Self.FK_CCTS_RMLS">
+            <End Role="RMLS" EntitySet="RMLS" />
+            <End Role="CCTS" EntitySet="CCTS" />
+          </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS" Association="Self.FK_CONFIGURATIONS_APPLICATION_DISPLAY_PANEL_VERSIONS">
             <End Role="APPLICATION_DISPLAY_PANEL_VERSIONS" EntitySet="APPLICATION_DISPLAY_PANEL_VERSIONS" />
             <End Role="CONFIGURATIONS" EntitySet="CONFIGURATIONS" />
@@ -1220,6 +1299,8 @@
           <EntitySet Name="APPLICATION_VERSIONS" EntityType="RemoteModel.APPLICATION_VERSIONS" />
           <EntitySet Name="CARTRIDGE_TYPES" EntityType="RemoteModel.CARTRIDGE_TYPES" />
           <EntitySet Name="CARTRIDGES" EntityType="RemoteModel.CARTRIDGE" />
+          <EntitySet Name="CATS" EntityType="RemoteModel.CAT" />
+          <EntitySet Name="CCTS" EntityType="RemoteModel.CCT" />
           <EntitySet Name="CONFIGURATIONS" EntityType="RemoteModel.CONFIGURATION" />
           <EntitySet Name="CONTACTS" EntityType="RemoteModel.CONTACT" />
           <EntitySet Name="DISPENSER_TYPES" EntityType="RemoteModel.DISPENSER_TYPES" />
@@ -1287,6 +1368,18 @@
             <End Role="CARTRIDGE" EntitySet="CARTRIDGES" />
             <End Role="IDS_PACKS" EntitySet="IDS_PACKS" />
           </AssociationSet>
+          <AssociationSet Name="FK_CATS_LIQUID_TYPES" Association="RemoteModel.FK_CATS_LIQUID_TYPES">
+            <End Role="LIQUID_TYPES" EntitySet="LIQUID_TYPES" />
+            <End Role="CAT" EntitySet="CATS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_CATS_MACHINES" Association="RemoteModel.FK_CATS_MACHINES">
+            <End Role="MACHINE" EntitySet="MACHINES" />
+            <End Role="CAT" EntitySet="CATS" />
+          </AssociationSet>
+          <AssociationSet Name="FK_CCTS_RMLS" Association="RemoteModel.FK_CCTS_RMLS">
+            <End Role="RML" EntitySet="RMLS" />
+            <End Role="CCT" EntitySet="CCTS" />
+          </AssociationSet>
           <AssociationSet Name="FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS">
             <End Role="EMBEDDED_FIRMWARE_VERSIONS" EntitySet="EMBEDDED_FIRMWARE_VERSIONS" />
             <End Role="CONFIGURATION" EntitySet="CONFIGURATIONS" />
@@ -1524,6 +1617,38 @@
           <NavigationProperty Name="CARTRIDGE_TYPES" Relationship="RemoteModel.FK_CARTRIDGES_CARTRIDGE_TYPES" FromRole="CARTRIDGE" ToRole="CARTRIDGE_TYPES" />
           <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES" FromRole="CARTRIDGE" ToRole="IDS_PACKS" />
         </EntityType>
+        <EntityType Name="CAT">
+          <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="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="LIQUID_TYPE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="MACHINE_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <Property Name="DATA" Type="Binary" Nullable="false" MaxLength="Max" FixedLength="false" />
+          <NavigationProperty Name="LIQUID_TYPES" Relationship="RemoteModel.FK_CATS_LIQUID_TYPES" FromRole="CAT" ToRole="LIQUID_TYPES" />
+          <NavigationProperty Name="MACHINE" Relationship="RemoteModel.FK_CATS_MACHINES" FromRole="CAT" ToRole="MACHINE" />
+        </EntityType>
+        <EntityType Name="CCT">
+          <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="DELETED" Type="Boolean" Nullable="false" />
+          <Property Name="NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="DESCRIPTION" Type="String" Nullable="false" MaxLength="200" FixedLength="false" Unicode="true" />
+          <Property Name="FORWARD_FILE_NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="INVERSE_FILE_NAME" Type="String" Nullable="false" MaxLength="100" FixedLength="false" Unicode="true" />
+          <Property Name="FORWARD_DATA" Type="Binary" Nullable="false" MaxLength="Max" FixedLength="false" />
+          <Property Name="INVERSE_DATA" Type="Binary" Nullable="false" MaxLength="Max" FixedLength="false" />
+          <Property Name="VERSION" Type="Double" Nullable="false" />
+          <Property Name="RML_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="RML" Relationship="RemoteModel.FK_CCTS_RMLS" FromRole="CCT" ToRole="RML" />
+        </EntityType>
         <EntityType Name="CONFIGURATION">
           <Key>
             <PropertyRef Name="GUID" />
@@ -1724,6 +1849,7 @@
           <Property Name="NAME" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
           <Property Name="VERSION" Type="Double" Nullable="false" />
           <Property Name="COLOR" Type="Int32" Nullable="false" />
+          <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_LIQUID_TYPES" FromRole="LIQUID_TYPES" ToRole="CAT" />
           <NavigationProperty Name="IDS_PACKS" Relationship="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_LIQUIDS" FromRole="LIQUID_TYPES" ToRole="IDS_PACKS" />
           <NavigationProperty Name="LIQUID_TYPES_RMLS" Relationship="RemoteModel.FK_LIQUIDS_RML_LIQUIDS" FromRole="LIQUID_TYPES" ToRole="LIQUID_TYPES_RMLS" />
         </EntityType>
@@ -1768,6 +1894,7 @@
           <Property Name="ORGANIZATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="MACHINE_VERSION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
           <Property Name="CONFIGURATION_GUID" Type="String" Nullable="false" MaxLength="36" FixedLength="false" Unicode="false" />
+          <NavigationProperty Name="CATS" Relationship="RemoteModel.FK_CATS_MACHINES" FromRole="MACHINE" ToRole="CAT" />
           <NavigationProperty Name="CONFIGURATION" Relationship="RemoteModel.FK_MACHINES_CONFIGURATIONS" FromRole="MACHINE" ToRole="CONFIGURATION" />
           <NavigationProperty Name="MACHINE_VERSIONS" Relationship="RemoteModel.FK_MACHINES_MACHINE_VERSIONS" FromRole="MACHINE" ToRole="MACHINE_VERSIONS" />
           <NavigationProperty Name="MACHINES_CONFIGURATIONS" Relationship="RemoteModel.FK_MACHINES_CONFIGURATIONS_MACHINES" FromRole="MACHINE" ToRole="MACHINES_CONFIGURATIONS" />
@@ -1907,6 +2034,7 @@
           <Property Name="TENSILE_STRENGTH" Type="Double" Nullable="false" />
           <Property Name="ELONGATION_AT_BREAK_PERCENTAGE" Type="Double" Nullable="false" />
           <Property Name="ESTIMATED_THREAD_DIAMETER" Type="Double" Nullable="false" />
+          <NavigationProperty Name="CCTS" Relationship="RemoteModel.FK_CCTS_RMLS" FromRole="RML" ToRole="CCT" />
           <NavigationProperty Name="FIBER_SHAPES" Relationship="RemoteModel.FK_RML_FIBER_SHAPES" FromRole="RML" ToRole="FIBER_SHAPES" />
           <NavigationProperty Name="FIBER_SYNTHS" Relationship="RemoteModel.FK_RML_FIBER_SYNTHESIS" FromRole="RML" ToRole="FIBER_SYNTHS" />
           <NavigationProperty Name="LINEAR_MASS_DENSITY_UNITS" Relationship="RemoteModel.FK_RML_LINEAR_MASS_DENSITY_UNITS" FromRole="RML" ToRole="LINEAR_MASS_DENSITY_UNITS" />
@@ -2093,6 +2221,42 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_CATS_LIQUID_TYPES">
+          <End Type="RemoteModel.LIQUID_TYPES" Role="LIQUID_TYPES" Multiplicity="1" />
+          <End Type="RemoteModel.CAT" Role="CAT" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="LIQUID_TYPES">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="CAT">
+              <PropertyRef Name="LIQUID_TYPE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_CATS_MACHINES">
+          <End Type="RemoteModel.MACHINE" Role="MACHINE" Multiplicity="1" />
+          <End Type="RemoteModel.CAT" Role="CAT" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="MACHINE">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="CAT">
+              <PropertyRef Name="MACHINE_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
+        <Association Name="FK_CCTS_RMLS">
+          <End Type="RemoteModel.RML" Role="RML" Multiplicity="1" />
+          <End Type="RemoteModel.CCT" Role="CCT" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="RML">
+              <PropertyRef Name="GUID" />
+            </Principal>
+            <Dependent Role="CCT">
+              <PropertyRef Name="RML_GUID" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS">
           <End Type="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Role="EMBEDDED_FIRMWARE_VERSIONS" Multiplicity="1" />
           <End Type="RemoteModel.CONFIGURATION" Role="CONFIGURATION" Multiplicity="*" />
@@ -2605,6 +2769,37 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="CATS">
+            <EntityTypeMapping TypeName="RemoteModel.CAT">
+              <MappingFragment StoreEntitySet="CATS">
+                <ScalarProperty Name="DATA" ColumnName="DATA" />
+                <ScalarProperty Name="MACHINE_GUID" ColumnName="MACHINE_GUID" />
+                <ScalarProperty Name="LIQUID_TYPE_GUID" ColumnName="LIQUID_TYPE_GUID" />
+                <ScalarProperty Name="DELETED" ColumnName="DELETED" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="CCTS">
+            <EntityTypeMapping TypeName="RemoteModel.CCT">
+              <MappingFragment StoreEntitySet="CCTS">
+                <ScalarProperty Name="RML_GUID" ColumnName="RML_GUID" />
+                <ScalarProperty Name="VERSION" ColumnName="VERSION" />
+                <ScalarProperty Name="INVERSE_DATA" ColumnName="INVERSE_DATA" />
+                <ScalarProperty Name="FORWARD_DATA" ColumnName="FORWARD_DATA" />
+                <ScalarProperty Name="INVERSE_FILE_NAME" ColumnName="INVERSE_FILE_NAME" />
+                <ScalarProperty Name="FORWARD_FILE_NAME" ColumnName="FORWARD_FILE_NAME" />
+                <ScalarProperty Name="DESCRIPTION" ColumnName="DESCRIPTION" />
+                <ScalarProperty Name="NAME" ColumnName="NAME" />
+                <ScalarProperty Name="DELETED" ColumnName="DELETED" />
+                <ScalarProperty Name="LAST_UPDATED" ColumnName="LAST_UPDATED" />
+                <ScalarProperty Name="GUID" ColumnName="GUID" />
+                <ScalarProperty Name="ID" ColumnName="ID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="CONFIGURATIONS">
             <EntityTypeMapping TypeName="RemoteModel.CONFIGURATION">
               <MappingFragment StoreEntitySet="CONFIGURATIONS">
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 4448347e9..1bf8a6a7b 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
+++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram
@@ -5,45 +5,47 @@
     <!-- Diagram content (shape and connector positions) -->
     <edmx:Diagrams>
       <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1">
-        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="12.5" PointY="40.75" />
-        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3" PointY="23" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="26" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="22.875" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="29" />
-        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="13.5" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="0.75" PointY="6" />
-        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE" Width="1.5" PointX="3" PointY="3.625" />
-        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="7.5" />
-        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3" PointY="19" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="32.625" />
-        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="32.625" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="16.625" />
-        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="9.125" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="7.5" PointY="19.625" />
-        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="14.75" PointY="19.75" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="11.75" PointY="27.25" />
-        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="11.75" PointY="24.125" />
-        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="19.75" />
-        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="8.625" />
-        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="11.75" PointY="30.375" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="14.875" />
-        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="16.25" PointY="10" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="5.25" PointY="13.25" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="7.5" PointY="9.875" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="9.75" PointY="9.375" />
-        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="9.75" PointY="13.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="11.75" PointY="18.125" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="11.75" PointY="33.5" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="11.75" PointY="7" />
-        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="11.75" PointY="21" />
-        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="5.25" PointY="21.25" />
-        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="10.5" PointY="37.375" />
-        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="14" PointY="4.75" />
-        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="10.5" PointY="2.625" />
-        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="12.75" PointY="0.75" />
-        <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="5.75" PointY="4.25" />
-        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="7.5" PointY="15.125" />
-        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="12.75" PointY="14.75" />
+        <EntityTypeShape EntityType="RemoteModel.ACTION_TYPES" Width="1.5" PointX="10.5" PointY="37.5" />
+        <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="3" PointY="16.25" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="0.75" PointY="15.875" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="22" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="0.75" PointY="12.75" />
+        <EntityTypeShape EntityType="RemoteModel.APPLICATION_VERSIONS" Width="1.5" PointX="0.75" PointY="28.25" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="0.75" PointY="35" />
+        <EntityTypeShape EntityType="RemoteModel.CARTRIDGE" Width="1.5" PointX="3" PointY="34.875" />
+        <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="9.75" PointY="12.625" />
+        <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="17.25" PointY="19.125" />
+        <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="3" PointY="6.75" />
+        <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="3" PointY="20.5" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="31.75" />
+        <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="31.625" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="8.375" />
+        <EntityTypeShape EntityType="RemoteModel.EMBEDDED_SOFTWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="19" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="10.5" PointY="4.375" />
+        <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES_ACTIONS" Width="1.5" PointX="12.75" PointY="4.5" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="12.75" PointY="0.75" />
+        <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="12.75" PointY="31" />
+        <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="0.75" PointY="25.125" />
+        <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="7.875" />
+        <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="12.75" PointY="24.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="2.75" />
+        <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="17.25" PointY="10.75" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="5.25" PointY="12.5" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="7.5" PointY="9" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_CONFIGURATIONS" Width="1.5" PointX="9.75" PointY="8.625" />
+        <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="12.75" PointY="9.375" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_COLORS" Width="1.5" PointX="12.75" PointY="21.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="12.75" PointY="16.5" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="12.75" PointY="27.875" />
+        <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="12.75" PointY="34.125" />
+        <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="5.25" PointY="18.5" />
+        <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="15.5" PointY="2.5" />
+        <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="15" PointY="14" />
+        <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="15.5" PointY="6.375" />
+        <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="17.75" PointY="6.5" />
+        <EntityTypeShape EntityType="RemoteModel.SYNC_CONFIGURATIONS" Width="1.5" PointX="5.75" PointY="1.625" />
+        <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="10.5" PointY="16.875" />
+        <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="17.75" PointY="15.5" />
         <AssociationConnector Association="RemoteModel.FK_EVENTS_ACTIONS_ACTIONS" />
         <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" />
         <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" />
@@ -53,6 +55,9 @@
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_APPLICATION_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_CARTRIDGES_CARTRIDGE_TYPES" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_DISPENSERS_CARTRIDGES" />
+        <AssociationConnector Association="RemoteModel.FK_CATS_LIQUID_TYPES" />
+        <AssociationConnector Association="RemoteModel.FK_CATS_MACHINES" />
+        <AssociationConnector Association="RemoteModel.FK_CCTS_RMLS" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_FIRMWARE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_EMBEDDED_SOFTWARE_VERSIONS" />
         <AssociationConnector Association="RemoteModel.FK_CONFIGURATIONS_HARDWARE_VERSIONS" />
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 24b595544..0159a5727 100644
--- a/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
+++ b/Software/Visual_Studio/Tango.DAL.Remote/Tango.DAL.Remote.csproj
@@ -89,6 +89,12 @@
     <Compile Include="DB\CARTRIDGE_TYPES.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
+    <Compile Include="DB\CAT.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
+    <Compile Include="DB\CCT.cs">
+      <DependentUpon>RemoteADO.tt</DependentUpon>
+    </Compile>
     <Compile Include="DB\CONFIGURATION.cs">
       <DependentUpon>RemoteADO.tt</DependentUpon>
     </Compile>
-- 
cgit v1.3.1