Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

66 files changed, 2786 insertions, 81 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ColorLabModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ColorLabModule.cs
index 41cd13cc4..3e63051ee 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ColorLabModule.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ColorLabModule.cs
@@ -50,7 +50,7 @@ namespace Tango.MachineStudio.ColorLab
         {
             get
             {
-                return Permissions.RunDeveloperModule;
+                return Permissions.RunColorLabModule;
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj
index 91bc51933..5a53e77a0 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Tango.MachineStudio.ColorLab.csproj
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -89,6 +89,7 @@
     <Compile Include="ViewModels\CalibrationDataVM.cs" />
     <Compile Include="ViewModels\LiquidVolumeVM.cs" />
     <Compile Include="ViewModels\MainViewVM.cs" />
+    <Compile Include="ViewModels\RgbVM.cs" />
     <Compile Include="Views\MainView.xaml.cs">
       <DependentUpon>MainView.xaml</DependentUpon>
     </Compile>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/CalibrationDataVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/CalibrationDataVM.cs
index 1bcb29835..87bbacab5 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/CalibrationDataVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/CalibrationDataVM.cs
@@ -4,6 +4,7 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL.Entities;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.ColorLab.ViewModels
@@ -26,6 +27,14 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             set { _color = value; RaisePropertyChangedAuto(); }
         }
 
+        private IdsPack _idsPack;
+
+        public IdsPack IdsPack
+        {
+            get { return _idsPack; }
+            set { _idsPack = value; RaisePropertyChangedAuto(); }
+        }
+
         private ObservableCollection<CalibrationDataPointVM> _calibrationPoints;
 
         public ObservableCollection<CalibrationDataPointVM> CalibrationPoints
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/LiquidVolumeVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/LiquidVolumeVM.cs
index a804d628b..a9d46f142 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/LiquidVolumeVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/LiquidVolumeVM.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Tango.BL.Entities;
 using Tango.SharedUI;
 
 namespace Tango.MachineStudio.ColorLab.ViewModels
@@ -32,5 +33,13 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             get { return _color; }
             set { _color = value; RaisePropertyChangedAuto(); }
         }
+
+        private IdsPack _idsPack;
+
+        public IdsPack IdsPack
+        {
+            get { return _idsPack; }
+            set { _idsPack = value; RaisePropertyChangedAuto(); }
+        }
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
index 8260f000a..e09b57e11 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/MainViewVM.cs
@@ -1,19 +1,33 @@
-using System;
+using Google.Protobuf;
+using Microsoft.Win32;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Media;
 using Tango.BL;
 using Tango.BL.Entities;
+using Tango.Core.Commands;
+using Tango.MachineStudio.Common.Controls;
+using Tango.PMR;
+using Tango.PMR.ColorLab;
 using Tango.SharedUI;
+using Tango.SharedUI.Controls;
 
 namespace Tango.MachineStudio.ColorLab.ViewModels
 {
     public class MainViewVM : ViewModel
     {
+        [DllImport("Tango.ColorLib.dll", CallingConvention = CallingConvention.Cdecl, EntryPoint = "Convert")]
+        public static extern int GetColorAdjust(IntPtr data, int size, ref IntPtr output);
+
         private ObservablesContext _dbContext;
+        private HiveComboControl _hiveCombo;
 
         #region Properties
 
@@ -27,11 +41,11 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             set { _machines = value; RaisePropertyChangedAuto(); }
         }
 
-        private ObservableCollection<ColorSpace> _colorSpaces;
+        private ObservableCollection<BL.Entities.ColorSpace> _colorSpaces;
         /// <summary>
         /// Gets or sets the color spaces.
         /// </summary>
-        public ObservableCollection<ColorSpace> ColorSpaces
+        public ObservableCollection<BL.Entities.ColorSpace> ColorSpaces
         {
             get { return _colorSpaces; }
             set { _colorSpaces = value; RaisePropertyChangedAuto(); }
@@ -57,6 +71,7 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             set
             {
                 _selectedMachine = value; RaisePropertyChangedAuto();
+                OnSelectedMachineChanged();
             }
         }
 
@@ -70,7 +85,7 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
             set
             {
                 _selectedRML = value;
-                InvalidateLiquidFactorsAndProcessTables();
+                InvalidateLiquidFactorsCalibrationData();
                 RaisePropertyChangedAuto();
             }
         }
@@ -86,7 +101,9 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
         }
 
         private ObservableCollection<LiquidVolumeVM> _liquidVolumes;
-
+        /// <summary>
+        /// Gets or sets the liquid volumes.
+        /// </summary>
         public ObservableCollection<LiquidVolumeVM> LiquidVolumes
         {
             get { return _liquidVolumes; }
@@ -94,43 +111,220 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
         }
 
         private ObservableCollection<CalibrationDataVM> _liquidsCalibrationData;
-
+        /// <summary>
+        /// Gets or sets the liquids calibration data.
+        /// </summary>
         public ObservableCollection<CalibrationDataVM> LiquidsCalibrationData
         {
             get { return _liquidsCalibrationData; }
             set { _liquidsCalibrationData = value; RaisePropertyChangedAuto(); }
         }
 
+        private RgbVM _sourceColor;
+        /// <summary>
+        /// Gets or sets the color of the source.
+        /// </summary>
+        public RgbVM SourceColor
+        {
+            get { return _sourceColor; }
+            set { _sourceColor = value; RaisePropertyChangedAuto(); }
+        }
+
+        private HexagonControl _selectedHexagon;
+        /// <summary>
+        /// Gets or sets the selected hexagon.
+        /// </summary>
+        public HexagonControl SelectedHexagon
+        {
+            get { return _selectedHexagon; }
+            set { _selectedHexagon = value; RaisePropertyChangedAuto(); }
+        }
+
+        private Cct _cct;
+        /// <summary>
+        /// Gets or sets the CCT.
+        /// </summary>
+        public Cct CCT
+        {
+            get { return _cct; }
+            set { _cct = value; RaisePropertyChangedAuto(); }
+        }
+
+        private int _deltaChroma;
+        /// <summary>
+        /// Gets or sets the delta chroma.
+        /// </summary>
+        public int DeltaChroma
+        {
+            get { return _deltaChroma; }
+            set { _deltaChroma = value; RaisePropertyChangedAuto(); }
+        }
+
+        private int _deltaL;
+        /// <summary>
+        /// Gets or sets the delta l.
+        /// </summary>
+        public int DeltaL
+        {
+            get { return _deltaL; }
+            set { _deltaL = value; RaisePropertyChangedAuto(); }
+        }
+
+
+        #endregion
+
+        #region Commands
+
+        public RelayCommand ImportForwardDataCommand { get; set; }
+
+        public RelayCommand ImportInverseDataCommand { get; set; }
+
         #endregion
 
         public MainViewVM() : base()
         {
             _dbContext = ObservablesContext.CreateDefault();
 
+            CCT = new Cct();
+
+            SourceColor = new RgbVM();
+            SourceColor.ColorChanged += SourceColor_ColorChanged;
             Machines = _dbContext.Machines.ToObservableCollection();
             ColorSpaces = _dbContext.ColorSpaces.ToObservableCollection();
             Rmls = _dbContext.Rmls.ToObservableCollection();
+
+            ImportForwardDataCommand = new RelayCommand(ImportForwardData, () => SelectedRML != null);
+            ImportInverseDataCommand = new RelayCommand(ImportInverseData, () => SelectedRML != null);
+        }
+
+        private void SourceColor_ColorChanged(object sender, Color color)
+        {
+            if (_hiveCombo != null)
+            {
+                GetHiveSuggestions();
+                _hiveCombo.GenerateDemoModeHiveColors(color);
+                _hiveCombo.SelectHeagon(_hiveCombo.CenterHexagon);
+            }
+        }
+
+        public void PutComboHiveControl(HiveComboControl hiveCombo)
+        {
+            _hiveCombo = hiveCombo;
+        }
+
+        #region ColorLab
+
+        private void GetHiveSuggestions()
+        {
+            ConversionInput input = new ConversionInput();
+            input.ColorSpace = PMR.ColorLab.ColorSpace.Rgb;
+            input.DeltaChroma = DeltaChroma;
+            input.DeltaL = DeltaL;
+            input.ForwardData = ByteString.CopyFrom(CCT.ForwardData);
+            input.InverseData = ByteString.CopyFrom(CCT.InverseData);
+            input.InputCoordinates.Red = (int)SourceColor.Red;
+            input.InputCoordinates.Green = (int)SourceColor.Green;
+            input.InputCoordinates.Blue = (int)SourceColor.Blue;
+            input.ThreadL = SelectedRML.MediaColor.L;
+            input.ThreadA = SelectedRML.MediaColor.A;
+            input.ThreadB = SelectedRML.MediaColor.B;
+
+            foreach (var vm in LiquidsCalibrationData)
+            {
+                InputLiquid inputLiquid = new InputLiquid();
+
+                CalibrationData calData = new CalibrationData();
+                calData.LiquidType = (PMR.ColorLab.LiquidType)vm.IdsPack.LiquidType.Code;
+                calData.CalibrationPoints.AddRange(vm.CalibrationPoints.Select(x => new CalibrationPoint() { X = x.X, Y = x.Y }));
+                inputLiquid.CalibrationData = calData;
+
+                inputLiquid.LiquidType = (PMR.ColorLab.LiquidType)vm.IdsPack.LiquidType.Code;
+                inputLiquid.MaxNanoliterPerCentimeter = LiquidTypesRmls.SingleOrDefault(x => x.LiquidType.Code == vm.IdsPack.LiquidType.Code).MaxNlPerCm;
+
+                input.InputCoordinates.InputLiquids.Add(inputLiquid);
+            }
+
+            NativePMR<ConversionInput, ConversionOutput> nativePMR = new NativePMR<ConversionInput, ConversionOutput>(GetColorAdjust);
+            ConversionOutput output = nativePMR.Invoke(input);
+
+            //Fill Hive !
+        }
+
+        #endregion
+
+        #region Import / Export Color Adjustment Data
+
+        private void ImportForwardData()
+        {
+            String file = GetCCTFile();
+            if (file != null)
+            {
+                CCT.ForwardFileName = Path.GetFileName(file);
+                CCT.ForwardData = File.ReadAllBytes(file);
+            }
         }
 
+        private void ImportInverseData()
+        {
+            String file = GetCCTFile();
+            if (file != null)
+            {
+                CCT.InverseFileName = Path.GetFileName(file);
+                CCT.InverseData = File.ReadAllBytes(file);
+            }
+        }
+
+        private String GetCCTFile()
+        {
+            OpenFileDialog dlg = new OpenFileDialog();
+            dlg.Title = "Select color adjustment file";
+            dlg.Filter = "Color Conversion Table|*.cct";
+            if (dlg.ShowDialogCenter())
+            {
+                return dlg.FileName;
+            }
+
+            return null;
+        }
+
+        #endregion
+
+        #region Liquid Volumes
+
+        private void OnSelectedMachineChanged()
+        {
+            if (SelectedMachine != null)
+            {
+                LiquidVolumes = SelectedMachine.Configuration.IdsPacks.OrderBy(x => x.PackIndex).Select(x => new LiquidVolumeVM()
+                {
+                    Color = x.LiquidType.Color,
+                    Name = x.LiquidType.Name,
+                    IdsPack = x,
+                }).ToObservableCollection();
+            }
+        }
+
+        #endregion
+
         #region RML
 
-        private void InvalidateLiquidFactorsAndProcessTables()
+        private void InvalidateLiquidFactorsCalibrationData()
         {
             if (SelectedRML != null && SelectedMachine != null)
             {
                 LiquidTypesRmls = SelectedMachine.Configuration.IdsPacks.OrderBy(x => x.PackIndex).Select(x => x.LiquidType).SelectMany(x => x.LiquidTypesRmls).Where(x => x.Rml.Guid == SelectedRML.Guid).ToList();
                 //RmlProcessParametersTableGroup = SelectedRML.ProcessParametersTablesGroups.ToList().SingleOrDefault(x => x.Active);
-                LiquidVolumes = SelectedMachine.Configuration.IdsPacks.OrderBy(x => x.PackIndex).Select(x => new LiquidVolumeVM() { Color = x.LiquidType.Color, Name = x.LiquidType.Name }).ToObservableCollection();
 
                 LiquidsCalibrationData = new ObservableCollection<CalibrationDataVM>();
 
-                foreach (var liquidType in SelectedMachine.Configuration.IdsPacks.OrderBy(x => x.PackIndex).Select(x => x.LiquidType))
+                foreach (var idsPack in SelectedMachine.Configuration.IdsPacks.OrderBy(x => x.PackIndex))
                 {
                     CalibrationDataVM vm = new CalibrationDataVM();
-                    vm.Name = liquidType.Name;
-                    vm.Color = liquidType.Color;
+                    vm.Name = idsPack.LiquidType.Name;
+                    vm.Color = idsPack.LiquidType.Color;
+                    vm.IdsPack = idsPack;
 
-                    var cat = liquidType.Cats.FirstOrDefault(x => x.Machine == SelectedMachine);
+                    var cat = idsPack.LiquidType.Cats.FirstOrDefault(x => x.Machine == SelectedMachine);
 
                     if (cat != null)
                     {
@@ -140,6 +334,13 @@ namespace Tango.MachineStudio.ColorLab.ViewModels
 
                     LiquidsCalibrationData.Add(vm);
                 }
+
+                CCT = SelectedRML.Ccts.FirstOrDefault();
+
+                if (CCT == null)
+                {
+                    CCT = new Cct();
+                }
             }
         }
 
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/RgbVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/RgbVM.cs
new file mode 100644
index 000000000..badb238fb
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/ViewModels/RgbVM.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.ColorLab.ViewModels
+{
+    public class RgbVM : ViewModel
+    {
+        public event EventHandler<Color> ColorChanged;
+
+        public RgbVM()
+        {
+            Color = Colors.DimGray;
+        }
+
+        private double _red;
+        public double Red
+        {
+            get { return _red; }
+            set { _red = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
+        }
+
+        private double _green;
+        public double Green
+        {
+            get { return _green; }
+            set { _green = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
+        }
+
+        private double _blue;
+        public double Blue
+        {
+            get { return _blue; }
+            set { _blue = value; SynchronizeColor(); RaisePropertyChangedAuto(); }
+        }
+
+        private Color _color;
+        public Color Color
+        {
+            get { return _color; }
+            set { _color = value; RaisePropertyChanged(nameof(Color)); SynchronizeComponents(); }
+        }
+
+        private void SynchronizeColor()
+        {
+            _color = Color.FromRgb((byte)Red, (byte)Green, (byte)Blue);
+            RaisePropertyChanged(nameof(Color));
+            ColorChanged?.Invoke(this, _color);
+        }
+
+        private void SynchronizeComponents()
+        {
+            _red = Color.R;
+            _green = Color.G;
+            _blue = Color.B;
+
+            RaisePropertyChanged(nameof(Red));
+            RaisePropertyChanged(nameof(Green));
+            RaisePropertyChanged(nameof(Blue));
+            RaisePropertyChanged(nameof(Color));
+
+            ColorChanged?.Invoke(this, Color);
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
index 92ef15231..c0f2912f3 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml
@@ -8,6 +8,7 @@
              xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:commonControls="clr-namespace:Tango.MachineStudio.Common.Controls;assembly=Tango.MachineStudio.Common"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
              xmlns:vm="clr-namespace:Tango.MachineStudio.ColorLab.ViewModels"
              xmlns:brushPicker="clr-namespace:Tango.BrushPicker;assembly=Tango.BrushPicker"
@@ -164,9 +165,9 @@
                 <Grid Grid.Row="1" Margin="0 40 0 0" HorizontalAlignment="Center">
                     <Grid>
                         <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="300" />
+                            <ColumnDefinition Width="250" />
+                            <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="Auto" />
-                            <ColumnDefinition Width="300" />
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="1*" />
                         </Grid.ColumnDefinitions>
@@ -179,41 +180,33 @@
 
                         <StackPanel VerticalAlignment="Center" Grid.Row="1">
                             <Border BorderThickness="1" BorderBrush="#545454" Margin="0" Padding="2 2 2 0">
-                                <brushPicker:BrushPicker x:Name="picker" Background="Transparent" BorderThickness="0" Height="150" BrushTypeVisibility="Collapsed">
-                                    <brushPicker:BrushPicker.Color>
-                                        <MultiBinding Converter="{StaticResource ColorToComponentsConverter}" Mode="TwoWay">
-                                            <Binding ElementName="sliderR" Path="Value" Mode="TwoWay"></Binding>
-                                            <Binding ElementName="sliderG" Path="Value" Mode="TwoWay"></Binding>
-                                            <Binding ElementName="sliderB" Path="Value" Mode="TwoWay"></Binding>
-                                        </MultiBinding>
-                                    </brushPicker:BrushPicker.Color>
-                                </brushPicker:BrushPicker>
+                                <brushPicker:BrushPicker x:Name="picker" Color="{Binding SourceColor.Color,Mode=TwoWay}" Background="Transparent" BorderThickness="0" Height="150" BrushTypeVisibility="Collapsed"></brushPicker:BrushPicker>
                             </Border>
 
                             <DockPanel Margin="0 10 0 0">
                                 <TextBlock DockPanel.Dock="Left" Text="R" VerticalAlignment="Center" />
-                                <TextBlock DockPanel.Dock="Right" Text="{Binding ElementName=picker,Path=Color.R}"></TextBlock>
-                                <Slider x:Name="sliderR" Margin="10 0" Maximum="255"></Slider>
+                                <TextBlock DockPanel.Dock="Right" Text="{Binding SourceColor.Red}"></TextBlock>
+                                <Slider x:Name="sliderR" Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Red,Mode=TwoWay}"></Slider>
                             </DockPanel>
                             <DockPanel Margin="0 10 0 0">
                                 <TextBlock DockPanel.Dock="Left" Text="G" VerticalAlignment="Center" />
-                                <TextBlock DockPanel.Dock="Right" Text="{Binding ElementName=picker,Path=Color.G}"></TextBlock>
-                                <Slider x:Name="sliderG" Margin="10 0" Maximum="255"></Slider>
+                                <TextBlock DockPanel.Dock="Right" Text="{Binding SourceColor.Green}"></TextBlock>
+                                <Slider x:Name="sliderG" Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Green,Mode=TwoWay}"></Slider>
                             </DockPanel>
                             <DockPanel Margin="0 10 0 0">
                                 <TextBlock DockPanel.Dock="Left" Text="B" VerticalAlignment="Center" />
-                                <TextBlock DockPanel.Dock="Right" Text="{Binding ElementName=picker,Path=Color.B}"></TextBlock>
-                                <Slider x:Name="sliderB" Margin="10 0" Maximum="255"></Slider>
+                                <TextBlock DockPanel.Dock="Right" Text="{Binding SourceColor.Blue}"></TextBlock>
+                                <Slider x:Name="sliderB" Margin="10 0" IsSnapToTickEnabled="True" TickFrequency="1" Maximum="255" Value="{Binding SourceColor.Blue,Mode=TwoWay}"></Slider>
                             </DockPanel>
                         </StackPanel>
 
                         <TextBlock FontStyle="Italic" HorizontalAlignment="Center">SOURCE / INVERSE RGB</TextBlock>
-                        <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="2">SUGGESTIONS</TextBlock>
+                        <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="2" Margin="-120 0 0 0">SUGGESTIONS</TextBlock>
                         <TextBlock FontStyle="Italic" HorizontalAlignment="Center" Grid.Column="4">LIQUID VOLUMES</TextBlock>
 
                         <Image Source="../Images/arrow-long-right.png" Grid.Column="1" Grid.Row="1" Width="140" Opacity="0.8" Margin="20 0 0 0"></Image>
 
-                        <controls:HiveControl Width="200" Height="200" Grid.Column="2" Grid.Row="1" />
+                        <commonControls:HiveComboControl x:Name="hiveCombo" Grid.Column="2" Grid.Row="1" Resolution="{Binding DeltaChroma,Mode=OneWayToSource}" LAxisValue="{Binding DeltaL,Mode=OneWayToSource}" />
 
                         <Image Source="../Images/arrow-long-right.png" Grid.Column="3" Grid.Row="1" Width="140" Opacity="0.8" Margin="0 0 20 0"></Image>
 
@@ -281,7 +274,7 @@
                                     <TextBlock DockPanel.Dock="Top" FontSize="9" TextAlignment="Center">COMPOSITE</TextBlock>
                                     <Ellipse Height="70"  Margin="0 5 0 0" Stroke="#202020">
                                         <Ellipse.Fill>
-                                            <SolidColorBrush Color="{Binding ElementName=picker,Path=Color}"></SolidColorBrush>
+                                            <SolidColorBrush Color="{Binding SourceColor.Color}"></SolidColorBrush>
                                         </Ellipse.Fill>
                                     </Ellipse>
                                 </DockPanel>
@@ -352,7 +345,7 @@
                                                 <TextBlock Text="{Binding Name}" HorizontalAlignment="Center" Foreground="Black"></TextBlock>
                                             </Border>
 
-                                            <Grid>
+                                            <Grid Margin="0 0 0 5">
                                                 <DataGrid Background="#BBFFFFFF" AlternatingRowBackground="#CCE1E1E1" BorderThickness="1" BorderBrush="#202020" Margin="5 0" ItemsSource="{Binding CalibrationPoints}" CanUserResizeColumns="False" CanUserReorderColumns="False" AutoGenerateColumns="False" CanUserAddRows="True" CanUserDeleteRows="True" CanUserSortColumns="True">
                                                     <DataGrid.CellStyle>
                                                         <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml.cs
index 1a96386f6..d78750050 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ColorLab/Views/MainView.xaml.cs
@@ -12,6 +12,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Tango.MachineStudio.ColorLab.ViewModels;
 
 namespace Tango.MachineStudio.ColorLab.Views
 {
@@ -20,9 +21,19 @@ namespace Tango.MachineStudio.ColorLab.Views
     /// </summary>
     public partial class MainView : UserControl
     {
+        private MainViewVM _vm;
+
         public MainView()
         {
             InitializeComponent();
+
+            this.Loaded += MainView_Loaded;
+        }
+
+        private void MainView_Loaded(object sender, RoutedEventArgs e)
+        {
+            _vm = DataContext as MainViewVM;
+            _vm.PutComboHiveControl(hiveCombo);
         }
     }
 }
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 be8503199..cefaac6f3 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
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml
index a88add000..9fcfc5a89 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorView.xaml
@@ -27,8 +27,12 @@
             <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="Color:" FontWeight="Bold"></TextBlock>
-            <colorPicker:ColorPickerCombo SelectedColor="{Binding EditEntity.Color,Mode=TwoWay,Converter={StaticResource ColorToIntegerConverter},UpdateSourceTrigger=PropertyChanged}"></colorPicker:ColorPickerCombo>
+            <TextBlock Text="L:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="0" Maximum="100" Value="{Binding EditEntity.L,Mode=TwoWay}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
+            <TextBlock Text="A:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="-128" Maximum="128" Value="{Binding EditEntity.A,Mode=TwoWay}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
+            <TextBlock Text="B:" FontWeight="Bold"></TextBlock>
+            <mahapps:NumericUpDown Minimum="-128" Maximum="128" Value="{Binding EditEntity.B,Mode=TwoWay}" InterceptArrowKeys="True" Background="Transparent" BorderThickness="0" InterceptMouseWheel="True" HasDecimals="True" HorizontalContentAlignment="Left"></mahapps:NumericUpDown>
         </controls:TableGrid>
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml
index 644c865da..57adda44d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/Views/DBViews/MediaColorsView.xaml
@@ -20,12 +20,16 @@
                 <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="L" Binding="{Binding L}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="A" Binding="{Binding A}"></DataGridTextColumn>
+                    <DataGridTextColumn Header="B" Binding="{Binding B}"></DataGridTextColumn>
                     <DataGridTemplateColumn Header="Color">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <Rectangle Width="50">
                                     <Rectangle.Fill>
-                                        <SolidColorBrush Color="{Binding Color,Converter={StaticResource ColorToIntegerConverter},Mode=TwoWay}"></SolidColorBrush>
+                                        <SolidColorBrush Color="{Binding Color}"></SolidColorBrush>
                                     </Rectangle.Fill>
                                 </Rectangle>
                             </DataTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj
index c8f15e9c9..d4df08651 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DataCapture/Tango.MachineStudio.DataCapture.csproj
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
index 0e64872f7..920dfd922 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Tango.MachineStudio.Developer.csproj
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
index 566dc7a16..b2dded955 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/ViewModels/MainViewVM.cs
@@ -40,7 +40,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
     /// Represents the developer module main view, view model.
     /// </summary>
     /// <seealso cref="Tango.SharedUI.ViewModel" />
-    public class MainViewVM : ViewModel<IMainView>, IShutdownRequestBlocker, IShutdownListener
+    public class MainViewVM : ViewModel, IShutdownRequestBlocker, IShutdownListener
     {
         private static object _syncLock = new object();
         private const string EMB_FORMATS_EXPORT = "Baby Lock (PES)|*.pes|Tajima (DST)|*.dst|EXP|*.exp|PCS|*.pcs|HUS|*.hus|KSM|*.ksm";
@@ -596,18 +596,9 @@ namespace Tango.MachineStudio.Developer.ViewModels
         /// <summary>
         /// Initializes a new instance of the <see cref="MainViewVM"/> class.
         /// </summary>
-        public MainViewVM(IMainView view) : base(view, true)
-        {
-
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MainViewVM"/> class.
-        /// </summary>
         /// <param name="applicationManager">The application manager.</param>
         /// <param name="notificationProvider">The notification provider.</param>
-        [PreferredConstructor]
-        public MainViewVM(IMainView view, IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, IDiagnosticsFrameProvider diagnosticsFrameProvider, IVideoCaptureProvider videoCaptureProvider, DeveloperNavigationManager navigation, IAuthenticationProvider authentication) : this(view)
+        public MainViewVM(IStudioApplicationManager applicationManager, INotificationProvider notificationProvider, IDiagnosticsFrameProvider diagnosticsFrameProvider, IVideoCaptureProvider videoCaptureProvider, DeveloperNavigationManager navigation, IAuthenticationProvider authentication)
         {
             SelectedJobs = new ObservableCollection<Job>();
 
@@ -1710,7 +1701,7 @@ namespace Tango.MachineStudio.Developer.ViewModels
                             Red = stop.Color.R,
                             Green = stop.Color.G,
                             Blue = stop.Color.B,
-                            OffsetPercent = stop.Offset,
+                            OffsetPercent = stop.Offset * 100d,
                             ColorSpace = _machineDbContext.ColorSpaces.ToList().SingleOrDefault(x => x.Code == BL.Enumerations.ColorSpaces.RGB.ToInt32()),
                         });
                     }
@@ -1799,14 +1790,5 @@ namespace Tango.MachineStudio.Developer.ViewModels
         }
 
         #endregion
-
-        #region IMainView
-
-        protected override void OnViewAttached()
-        {
-            base.OnViewAttached();
-        }
-
-        #endregion
     }
 }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
index 42d0bb106..8d25719e8 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/EmbroideryImportView.xaml
@@ -46,7 +46,7 @@
                 <StackPanel>
                     <TextBlock Margin="5">Region Brush</TextBlock>
                     <Border Margin="5" BorderThickness="1" BorderBrush="Silver">
-                        <brushPicker:BrushPicker Background="White" BorderThickness="0" Brush="{Binding ElementName=editor,Path=SelectedPath.Brush,Mode=TwoWay}" />
+                        <brushPicker:BrushPicker Background="White" BorderThickness="0" Brush="{Binding ElementName=editor,Path=SelectedPath.Brush,Mode=TwoWay}" Height="220" />
                     </Border>
 
                     <Border BorderThickness="1" BorderBrush="Silver" Padding="5 0 5 5" Margin="5">
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 1dea01de7..4c0784d1d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -157,13 +157,13 @@
                                 </StackPanel>
                             </ToggleButton>
                             <Popup x:Name="Popup" MouseDown="Popup_MouseDown" PopupAnimation="Fade" StaysOpen="False" PlacementTarget="{Binding ElementName=PopupButton}"  Placement="Bottom" AllowsTransparency="True">
-                                <Border Background="#E6FFFFFF" Height="250" Width="550" CornerRadius="5" Margin="10">
+                                <Border Background="#E6FFFFFF" CornerRadius="5" Margin="10">
                                     <Border.Effect>
                                         <DropShadowEffect ShadowDepth="0" BlurRadius="10" />
                                     </Border.Effect>
                                     <Grid>
                                         <Grid Margin="10">
-                                            <commonControls:HiveColorPickerControl SelectedColorChanged="HiveColorPickerControl_SelectedColorChanged" SelectedColor="{Binding Color,Mode=TwoWay}" DemoMode="True" />
+                                            <commonControls:HiveColorPickerControl SelectedHiveColorChanged="HiveColorPickerControl_SelectedColorChanged" SelectedColor="{Binding Color,Mode=OneWay}" SelectedHiveColor="{Binding Color,Mode=OneWayToSource}" DemoMode="True" />
                                         </Grid>
                                     </Grid>
                                 </Border>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
index 905caa96d..044046450 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml.cs
@@ -82,6 +82,7 @@ namespace Tango.MachineStudio.Developer.Views
                 }
 
                 jobBrushList.ItemsSource = segments;
+                UpdateGradientBrushDisplay();
             }
         }
 
@@ -125,7 +126,7 @@ namespace Tango.MachineStudio.Developer.Views
 
         }
 
-        private void HiveColorPickerControl_SelectedColorChanged(object sender, Color e)
+        private void HiveColorPickerControl_SelectedColorChanged(object sender, Color color)
         {
             UpdateGradientBrushDisplay();
         }
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj
index 458a9f853..af3a76c0b 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.HardwareDesigner/Tango.MachineStudio.HardwareDesigner.csproj
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj
index 3b0e1d1cc..c329685c6 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/Tango.MachineStudio.MachineDesigner.csproj
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj
index 87b159c0e..85928cb0c 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Stubs/Tango.MachineStudio.Stubs.csproj
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj
index 631997fc8..1b827f001 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Synchronization/Tango.MachineStudio.Synchronization.csproj
@@ -27,7 +27,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml
new file mode 100644
index 000000000..60b96bc9d
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml
@@ -0,0 +1,140 @@
+<local:ElementEditor x:Class="Tango.MachineStudio.Technician.Editors.ControllerElementEditor"
+             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:sharedConverters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:items="clr-namespace:Tango.MachineStudio.Technician.TechItems"
+             xmlns:gauge="clr-namespace:Tango.CircularGauge;assembly=Tango.CircularGauge"
+             xmlns:converters="clr-namespace:Tango.Editors.Converters;assembly=Tango.Editors"
+             xmlns:visuals="clr-namespace:Tango.Visuals;assembly=Tango.Visuals"
+             xmlns:local="clr-namespace:Tango.Editors;assembly=Tango.Editors"
+             mc:Ignorable="d" Background="Transparent" ClipToBounds="False" BorderThickness="0"  MinWidth="1" MinHeight="1" RenderTransformOrigin="0.5,0.5" d:DataContext="{d:DesignInstance Type=items:ControllerItem, IsDesignTimeCreatable=False}" Height="245.074" Width="321.75">
+
+    <UserControl.Resources>
+        <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"></converters:BoolToVisibilityConverter>
+        <sharedConverters:BooleanInverseConverter x:Key="BooleanInverseConverter" />
+
+        <!--Theme-->
+        <SolidColorBrush x:Key="BorderBrush" Color="Transparent"></SolidColorBrush>
+        <SolidColorBrush x:Key="CornersBrush" Color="Red"></SolidColorBrush>
+    </UserControl.Resources>
+
+    <UserControl.RenderTransform>
+        <RotateTransform Angle="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=Angle}"></RotateTransform>
+    </UserControl.RenderTransform>
+
+    <Grid ClipToBounds="False">
+
+
+        <!--Content-->
+        <Grid ClipToBounds="False" IsHitTestVisible="{Binding RelativeSource={RelativeSource AncestorType=local:ElementsEditor},Path=IsEditable,Converter={StaticResource BooleanInverseConverter}}">
+            <Border>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="1*" />
+                        <ColumnDefinition Width="100" />
+                    </Grid.ColumnDefinitions>
+                    <Viewbox>
+                        <Grid>
+                            <gauge:CircularGaugeControl
+                                        Margin="10"
+                                        Radius="150" 
+                                        ScaleRadius="110" 
+                                        ScaleStartAngle="120" 
+                                        ScaleSweepAngle="300"
+                                        PointerLength="85" 
+                                        PointerCapRadius="35" 
+                                        MinValue="{Binding TechController.Min}" 
+                                        MaxValue="{Binding TechController.Max}" 
+                                        MajorDivisionsCount="10" 
+                                        MinorDivisionsCount="5" 
+                                        CurrentValue="{Binding EffectiveValue}"
+                                        ImageSize="40,50"
+                                        RangeIndicatorThickness="8"
+                                        RangeIndicatorRadius="120"
+                                        RangeIndicatorLightRadius="10"
+                                        RangeIndicatorLightOffset="80"
+                                        ScaleLabelRadius="90"
+                                        ScaleLabelSize="40,20"
+                                        ScaleLabelFontSize="10"
+                                        ScaleLabelForeground="LightGray"
+                                        MajorTickSize="10,3"
+                                        MinorTickSize="3,1"
+                                        MajorTickColor="LightGray"
+                                        MinorTickColor="LightGray"
+                                        ImageOffset="-50"
+                                        GaugeBackgroundColor="Black"
+                                        PointerThickness ="16"
+                                        OptimalRangeStartValue="300"
+                                        OptimalRangeEndValue="700" 
+                                        DialTextOffset="40" 
+                                        DialTextColor="Black"
+                                        >
+
+                            </gauge:CircularGaugeControl>
+                        </Grid>
+                    </Viewbox>
+
+                    <Grid Grid.Column="1" HorizontalAlignment="Right">
+                        <Slider Orientation="Vertical" Margin="15" TickPlacement="None" Minimum="{Binding TechController.Min}" Maximum="{Binding TechController.Max}" Value="{Binding Value,Delay=1000}">
+                            <Slider.Foreground>
+                                <SolidColorBrush Color="{Binding Color}" />
+                            </Slider.Foreground>
+                        </Slider>
+
+                        <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" FontFamily="../Fonts/#digital-7" TextAlignment="Right" Margin="-80 10 0 0" FontSize="30" Text="{Binding Value,StringFormat=0.00}">
+                            <TextBlock.Foreground>
+                                <SolidColorBrush Color="{Binding Color}" />
+                            </TextBlock.Foreground>
+                        </TextBlock>
+                    </Grid>
+                </Grid>
+            </Border>
+
+            <Border Margin="0 0 0 -23" VerticalAlignment="Bottom">
+                <TextBlock Text="{Binding TechController.Description}" FontSize="14" Foreground="DimGray" HorizontalAlignment="Center"></TextBlock>
+            </Border>
+        </Grid>
+        <!--Content-->
+
+
+        <Border BorderThickness="1" BorderBrush="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=BorderBrush,TargetNullValue={StaticResource BorderBrush},FallbackValue={StaticResource BorderBrush}}" Visibility="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=(local:ElementsEditor.IsSelected),Converter={StaticResource BoolToVisibilityConverter}}">
+            <Grid>
+                <ContentPresenter Content="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=InnerContent}"></ContentPresenter>
+
+                <Thumb Opacity="0" DragDelta="MoveDrag" DragStarted="DragStarted" DragCompleted="OnDragEnded"></Thumb>
+                <Thumb HorizontalAlignment="Left" Cursor="SizeWE" Opacity="0" DragDelta="DragLeft" DragStarted="DragStarted" DragCompleted="OnDragEnded"></Thumb>
+                <Thumb HorizontalAlignment="Right" Cursor="SizeWE" Opacity="0" DragDelta="DragRight" DragStarted="DragStarted" DragCompleted="OnDragEnded"></Thumb>
+                <Thumb VerticalAlignment="Top" Cursor="SizeNS" Opacity="0" DragDelta="DragTop" DragStarted="DragStarted" DragCompleted="OnDragEnded"></Thumb>
+                <Thumb VerticalAlignment="Bottom" Cursor="SizeNS" Opacity="0" DragDelta="DragBottom" DragStarted="DragStarted" DragCompleted="OnDragEnded"></Thumb>
+
+                <Grid ClipToBounds="False" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="0 -20 0 0" Width="10" Height="10">
+                    <Ellipse Stroke="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=CornersBrush,TargetNullValue={StaticResource CornersBrush},FallbackValue={StaticResource CornersBrush}}" StrokeThickness="2"></Ellipse>
+                    <Rectangle HorizontalAlignment="Center" VerticalAlignment="Stretch" Margin="0 10 0 -8" StrokeThickness="1" Stroke="Red"></Rectangle>
+                    <Thumb Opacity="0" DragDelta="DragAngle" DragStarted="DragStarted" Cursor="Arrow" DragCompleted="OnDragEnded"></Thumb>
+                </Grid>
+
+                <Grid Width="10" Height="10" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="-8 -8 0 0">
+                    <Border BorderBrush="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=CornersBrush,TargetNullValue={StaticResource CornersBrush},FallbackValue={StaticResource CornersBrush}}" BorderThickness="2 2 0 0"></Border>
+                    <Thumb Opacity="0" DragDelta="DragTopLeft" DragStarted="DragStarted" Cursor="SizeNWSE" DragCompleted="OnDragEnded"></Thumb>
+                </Grid>
+
+                <Grid Width="10" Height="10" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 -8 -8 0">
+                    <Border BorderBrush="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=CornersBrush,TargetNullValue={StaticResource CornersBrush},FallbackValue={StaticResource CornersBrush}}" BorderThickness="0 2 2 0"></Border>
+                    <Thumb Opacity="0" DragDelta="DragTopRight" DragStarted="DragStarted" Cursor="SizeNESW" DragCompleted="OnDragEnded"></Thumb>
+                </Grid>
+
+                <Grid Width="10" Height="10" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0 0 -8 -8">
+                    <Border BorderBrush="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=CornersBrush,TargetNullValue={StaticResource CornersBrush},FallbackValue={StaticResource CornersBrush}}" BorderThickness="0 0 2 2"></Border>
+                    <Thumb Opacity="0" DragDelta="DragBottomRight" DragStarted="DragStarted" Cursor="SizeNWSE" DragCompleted="OnDragEnded"></Thumb>
+                </Grid>
+
+                <Grid Width="10" Height="10" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="-8 0 0 -8">
+                    <Border BorderBrush="{Binding RelativeSource={RelativeSource AncestorType=local:ElementEditor},Path=CornersBrush,TargetNullValue={StaticResource CornersBrush},FallbackValue={StaticResource CornersBrush}}" BorderThickness="2 0 0 2"></Border>
+                    <Thumb Opacity="0" DragDelta="DragBottomLeft" DragStarted="DragStarted" Cursor="SizeNESW" DragCompleted="OnDragEnded"></Thumb>
+                </Grid>
+            </Grid>
+        </Border>
+    </Grid>
+</local:ElementEditor>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml.cs
new file mode 100644
index 000000000..4d183dac6
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Editors/ControllerElementEditor.xaml.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Tango.Editors;
+using Tango.BL.Entities;
+using Tango.MachineStudio.Technician.TechItems;
+
+namespace Tango.MachineStudio.Technician.Editors
+{
+    [ContentProperty("InnerContent")]
+    public partial class ControllerElementEditor : ElementEditor
+    {
+        public ControllerElementEditor()
+            : base()
+        {
+            InitializeComponent();
+        }
+
+        public ControllerElementEditor(ControllerItem controllerItem)
+            : this()
+        {
+            ControllerItem = controllerItem;
+            DataContext = ControllerItem;
+        }
+
+        public ControllerElementEditor(ControllerItem controllerItem, Rect bounds)
+            : this(controllerItem)
+        {
+            Left = bounds.Left;
+            Top = bounds.Top;
+            Width = bounds.Width;
+            Height = bounds.Height;
+        }
+
+        private ControllerItem _controllerItem;
+
+        public ControllerItem ControllerItem
+        {
+            get { return _controllerItem; }
+            set { _controllerItem = value; RaisePropertyChanged(nameof(ControllerItem)); }
+        }
+
+
+        /// <summary>
+        /// Clones this instance.
+        /// </summary>
+        /// <returns></returns>
+        public override IElementEditor Clone()
+        {
+            try
+            {
+                var clonedItem = ControllerItem.Clone() as ControllerItem;
+                ControllerElementEditor cloned = new ControllerElementEditor(clonedItem);
+                cloned.Top = Top;
+                cloned.Left = Left;
+                cloned.Width = Width;
+                cloned.Height = Height;
+                cloned.Angle = Angle;
+                return cloned;
+            }
+            catch (Exception ex)
+            {
+                throw new InvalidOperationException("Could not clone this editor. You may have to create a custom editor and implement a custom Clone method.", ex);
+            }
+        }
+
+        /// <summary>
+        /// Gets the hosted element.
+        /// </summary>
+        [ParameterIgnore]
+        public override Object HostedElement
+        {
+            get { return ControllerItem; }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/controller.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/controller.png
new file mode 100644
index 000000000..5794f6cd8
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Images/controller.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/ControllerTemplate.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/ControllerTemplate.xaml
new file mode 100644
index 000000000..57d807b09
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/ControllerTemplate.xaml
@@ -0,0 +1,41 @@
+<UserControl x:Class="Tango.MachineStudio.Technician.PropertiesTemplates.ControllerTemplate"
+             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:converters="clr-namespace:Tango.MachineStudio.Technician.Converters"
+             xmlns:items="clr-namespace:Tango.MachineStudio.Technician.TechItems"
+              xmlns:mahapps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:colorPicker="clr-namespace:Tango;assembly=Tango.ColorPicker"
+             xmlns:local="clr-namespace:Tango.MachineStudio.Technician.PropertiesTemplates"
+             mc:Ignorable="d" 
+             d:DesignHeight="500" d:DesignWidth="200" d:DataContext="{d:DesignInstance Type=items:ControllerItem, IsDesignTimeCreatable=False}">
+
+    <UserControl.Resources>
+        <Style TargetType="{x:Type TabItem}" BasedOn="{StaticResource {x:Type TabItem}}">
+            <Setter Property="mahapps:ControlsHelper.HeaderFontSize" Value="14" />
+            <Setter Property="Margin" Value="2" />
+        </Style>
+    </UserControl.Resources>
+
+    <Grid>
+        <StackPanel>
+            <GroupBox Header="INPUT">
+                <StackPanel>
+                    <TextBlock FontSize="10">Selected Input</TextBlock>
+                    <ComboBox Margin="0 5 0 0" ItemsSource="{Binding Adapter.TechControllers}" SelectedItem="{Binding TechController,Mode=TwoWay}" DisplayMemberPath="Description" />
+
+                    <TextBlock FontSize="10" Margin="0 20 0 0"><Run>Update Interval</Run> <Run Text="{Binding UpdateInterval,StringFormat={}{0:N0} ms,FallbackValue=0}"></Run></TextBlock>
+                    <Slider Margin="0 5 0 0" Minimum="1" Maximum="1000" Value="{Binding UpdateInterval,Mode=TwoWay}"></Slider>
+                </StackPanel>
+            </GroupBox>
+            <GroupBox Header="COLOR" Margin="0 10 0 0">
+                <StackPanel>
+                    <Viewbox Margin="0 5 0 0">
+                        <colorPicker:ColorCanvas SelectedColor="{Binding Color,Mode=TwoWay}" Background="Transparent" />
+                    </Viewbox>
+                </StackPanel>
+            </GroupBox>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/ControllerTemplate.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/ControllerTemplate.xaml.cs
new file mode 100644
index 000000000..624eef296
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/PropertiesTemplates/ControllerTemplate.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.Technician.PropertiesTemplates
+{
+    /// <summary>
+    /// Interaction logic for MonitorTemplate.xaml
+    /// </summary>
+    public partial class ControllerTemplate : UserControl
+    {
+        public ControllerTemplate()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
index 7a497710b..ecc235d02 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Tango.MachineStudio.Technician.csproj
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\..\Build\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -102,6 +102,9 @@
     <Compile Include="Converters\TechIosToDigitalInsConverter.cs" />
     <Compile Include="Converters\TechIosToDigitalOutsConverter.cs" />
     <Compile Include="Converters\TransitionLinkConverter.cs" />
+    <Compile Include="Editors\ControllerElementEditor.xaml.cs">
+      <DependentUpon>ControllerElementEditor.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Editors\DigitalInElementEditor.xaml.cs">
       <DependentUpon>DigitalInElementEditor.xaml</DependentUpon>
     </Compile>
@@ -146,6 +149,9 @@
     <Compile Include="PropertiesTemplates\DispenserTemplate.xaml.cs">
       <DependentUpon>DispenserTemplate.xaml</DependentUpon>
     </Compile>
+    <Compile Include="PropertiesTemplates\ControllerTemplate.xaml.cs">
+      <DependentUpon>ControllerTemplate.xaml</DependentUpon>
+    </Compile>
     <Compile Include="PropertiesTemplates\MotorGroupTemplate.xaml.cs">
       <DependentUpon>MotorGroupTemplate.xaml</DependentUpon>
     </Compile>
@@ -164,6 +170,7 @@
     <Compile Include="PropertiesTemplates\SingleGraphTemplate.xaml.cs">
       <DependentUpon>SingleGraphTemplate.xaml</DependentUpon>
     </Compile>
+    <Compile Include="TechItems\ControllerItem.cs" />
     <Compile Include="TechItems\DigitalInItem.cs" />
     <Compile Include="TechItems\DigitalOutItem.cs" />
     <Compile Include="TechItems\MeterItem.cs" />
@@ -202,6 +209,10 @@
     <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
       <Link>GlobalVersionInfo.cs</Link>
     </Compile>
+    <Page Include="Editors\ControllerElementEditor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Editors\DigitalInElementEditor.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -258,6 +269,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="PropertiesTemplates\ControllerTemplate.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="PropertiesTemplates\MotorGroupTemplate.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -342,6 +357,10 @@
       <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
       <Name>Tango.BL</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.CircularGauge\Tango.CircularGauge.csproj">
+      <Project>{6efd5895-177b-4bbb-af52-29f4d53b3fbd}</Project>
+      <Name>Tango.CircularGauge</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.ColorPicker\Tango.ColorPicker.csproj">
       <Project>{a2f5af44-29ff-45d6-9d25-ecda5cce88b5}</Project>
       <Name>Tango.ColorPicker</Name>
@@ -460,5 +479,8 @@
   <ItemGroup>
     <Resource Include="Images\digital-in.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\controller.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ControllerItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ControllerItem.cs
new file mode 100644
index 000000000..67266ee66
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/ControllerItem.cs
@@ -0,0 +1,121 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+using System.Xml.Serialization;
+using Tango.BL.Entities;
+using Tango.SharedUI.Helpers;
+
+namespace Tango.MachineStudio.Technician.TechItems
+{
+    /// <summary>
+    /// Represents a single component value controller and monitor.
+    /// </summary>
+    /// <seealso cref="TechItem" />
+    [TechItem(10)]
+    public class ControllerItem : TechItem
+    {
+        /// <summary>
+        /// Occurs when the controller value has changed.
+        /// </summary>
+        public event EventHandler<double> ValueChanged;
+
+        private TechController _techController;
+        /// <summary>
+        /// Gets or sets the DB controller item.
+        /// </summary>
+        [XmlIgnore]
+        public TechController TechController
+        {
+            get { return _techController; }
+            set { _techController = value; RaisePropertyChangedAuto(); TechName = _techController != null ? _techController.Description : null; ItemGuid = value != null ? value.Guid : null; }
+        }
+
+        private double _value;
+        /// <summary>
+        /// Gets or sets the component value.
+        /// </summary>
+        [XmlIgnore]
+        public double Value
+        {
+            get { return _value; }
+            set
+            {
+                _value = value; RaisePropertyChangedAuto();
+                ValueChanged?.Invoke(this, _value);
+            }
+        }
+
+        private int _updateInterval;
+        /// <summary>
+        /// Gets or sets the update interval.
+        /// </summary>
+        public int UpdateInterval
+        {
+            get { return _updateInterval; }
+            set { _updateInterval = value; RaisePropertyChangedAuto(); }
+        }
+
+        /// <summary>
+        /// Gets or sets the last update time.
+        /// </summary>
+        [XmlIgnore]
+        public DateTime LastUpdateTime { get; set; }
+
+
+        private double _effectiveValue;
+        /// <summary>
+        /// Gets or sets the effective value received from the embedded device.
+        /// </summary>
+        [XmlIgnore]
+        public double EffectiveValue
+        {
+            get { return _effectiveValue; }
+            set
+            {
+                LastUpdateTime = DateTime.Now;
+
+                if (_effectiveValue != value)
+                {
+                    _effectiveValue = value;
+                    RaisePropertyChangedAuto();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ControllerItem"/> class.
+        /// </summary>
+        public ControllerItem() : base()
+        {
+            Name = "Value Controller";
+            Description = "Single component value controller";
+            Image = ResourceHelper.GetImageFromResources("Images/controller.png");
+            Color = Colors.DodgerBlue;
+            LastUpdateTime = DateTime.Now;
+            UpdateInterval = 10;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ControllerItem"/> class.
+        /// </summary>
+        /// <param name="techController">The db tech controller.</param>
+        public ControllerItem(TechController techController) : this()
+        {
+            TechController = techController;
+        }
+
+        /// <summary>
+        /// Clones this instance.
+        /// </summary>
+        /// <returns></returns>
+        public override TechItem Clone()
+        {
+            ControllerItem cloned = base.Clone() as ControllerItem;
+            cloned.TechController = TechController;
+            return cloned;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs
index 44d5d2c5a..e18250594 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/TechItems/TechItem.cs
@@ -29,6 +29,7 @@ namespace Tango.MachineStudio.Technician.TechItems
     [XmlInclude(typeof(ThreadMotionItem))]
     [XmlInclude(typeof(MotorGroupItem))]
     [XmlInclude(typeof(DigitalInItem))]
+    [XmlInclude(typeof(ControllerItem))]
     public abstract class TechItem : ExtendedObject
     {
         /// <summary>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index a5a95fc35..63aca3e70 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -39,7 +39,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
     /// <seealso cref="Tango.MachineStudio.Common.StudioApplication.IShutdownListener" />
     public class MachineTechViewVM : ViewModel, IShutdownListener
     {
-        private List<PropertyInfo> _diagnoticsDataProperties;
+        private List<PropertyInfo> _diagnoticsMonitorsDataProperties;
         private Dictionary<SingleGraphItem, GraphController> _singleControllers;
         private Dictionary<MultiGraphItem, GraphMultiController> _multiControllers;
         private static object _elementsLock = new object();
@@ -178,7 +178,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
             _multiControllers = new Dictionary<MultiGraphItem, GraphMultiController>();
             AvailableTechItems = TechItem.GetAvailableTechItems().ToObservableCollection();
             SelectedTechItem = AvailableTechItems.FirstOrDefault();
-            _diagnoticsDataProperties = typeof(PushDiagnosticsResponse).GetProperties(BindingFlags.Public | BindingFlags.Instance).ToList();
+            _diagnoticsMonitorsDataProperties = typeof(DiagnosticsMonitors).GetProperties(BindingFlags.Public | BindingFlags.Instance).ToList();
             ApplicationManager = applicationManager;
             ApplicationManager.ConnectedMachineChanged += ApplicationManager_ConnectedMachineChanged;
 
@@ -252,11 +252,11 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                         if (DateTime.Now > monitorItem.LastUpdateTime.AddMilliseconds(monitorItem.UpdateInterval))
                         {
-                            var prop = _diagnoticsDataProperties.SingleOrDefault(x => x.Name == monitorItem.TechMonitor.Name);
+                            var prop = _diagnoticsMonitorsDataProperties.SingleOrDefault(x => x.Name == monitorItem.TechMonitor.Name);
 
                             if (prop != null)
                             {
-                                monitorItem.Value = GetDataLastValue(monitorItem.TechMonitor, prop.GetValue(data));
+                                monitorItem.Value = GetDataLastValue(monitorItem.TechMonitor, prop.GetValue(data.Monitors));
                             }
                         }
                     }
@@ -266,11 +266,11 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                         if (DateTime.Now > meterItem.LastUpdateTime.AddMilliseconds(meterItem.UpdateInterval))
                         {
-                            var prop = _diagnoticsDataProperties.SingleOrDefault(x => x.Name == meterItem.TechMonitor.Name);
+                            var prop = _diagnoticsMonitorsDataProperties.SingleOrDefault(x => x.Name == meterItem.TechMonitor.Name);
 
                             if (prop != null)
                             {
-                                meterItem.Value = GetDataLastValue(meterItem.TechMonitor, prop.GetValue(data));
+                                meterItem.Value = GetDataLastValue(meterItem.TechMonitor, prop.GetValue(data.Monitors));
                             }
                         }
                     }
@@ -278,7 +278,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         SingleGraphItem graphItem = item as SingleGraphItem;
 
-                        var prop = _diagnoticsDataProperties.SingleOrDefault(x => x.Name == graphItem.TechMonitor.Name);
+                        var prop = _diagnoticsMonitorsDataProperties.SingleOrDefault(x => x.Name == graphItem.TechMonitor.Name);
 
                         if (prop != null)
                         {
@@ -286,7 +286,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                             if (_singleControllers.TryGetValue(graphItem, out controller))
                             {
-                                controller.PushData(GetDataArray(graphItem.TechMonitor, prop.GetValue(data)));
+                                controller.PushData(GetDataArray(graphItem.TechMonitor, prop.GetValue(data.Monitors)));
                             }
                         }
                     }
@@ -294,7 +294,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     {
                         MultiGraphItem graphItem = item as MultiGraphItem;
 
-                        var prop = _diagnoticsDataProperties.SingleOrDefault(x => x.Name == graphItem.TechMonitor.Name);
+                        var prop = _diagnoticsMonitorsDataProperties.SingleOrDefault(x => x.Name == graphItem.TechMonitor.Name);
 
                         if (prop != null)
                         {
@@ -302,7 +302,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
                             if (_multiControllers.TryGetValue(graphItem, out controller))
                             {
-                                controller.PushData(GetDataMatrix(graphItem.TechMonitor, prop.GetValue(data)));
+                                controller.PushData(GetDataMatrix(graphItem.TechMonitor, prop.GetValue(data.Monitors)));
                             }
                         }
                     }
@@ -328,6 +328,20 @@ namespace Tango.MachineStudio.Technician.ViewModels
                             digitalInItem.Value = digitalPin.Value;
                         }
                     }
+                    else if (item.GetType() == typeof(ControllerItem))
+                    {
+                        ControllerItem controllerItem = item as ControllerItem;
+
+                        if (DateTime.Now > controllerItem.LastUpdateTime.AddMilliseconds(controllerItem.UpdateInterval))
+                        {
+                            var componentState = data.ComponentsStates.SingleOrDefault(x => (int)x.Component == controllerItem.TechController.Code);
+
+                            if (componentState != null)
+                            {
+                                controllerItem.EffectiveValue = componentState.Value;
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -466,6 +480,11 @@ namespace Tango.MachineStudio.Technician.ViewModels
             {
                 CreateElement<DigitalInElementEditor, DigitalInItem, TechIo>(bounds, Adapter.TechIos.Where(x => x.Type == IOType.DigitalInput.ToInt32()).FirstOrDefault());
             }
+            else if (item is ControllerItem)
+            {
+                var editor = CreateElement<ControllerElementEditor, ControllerItem, TechController>(bounds, Adapter.TechControllers.FirstOrDefault());
+                InitControllerItem(editor.ControllerItem);
+            }
         }
 
         /// <summary>
@@ -559,6 +578,11 @@ namespace Tango.MachineStudio.Technician.ViewModels
                 (item as DigitalInItem).TechIo = Adapter.TechIos.FirstOrDefault(x => x.Guid == item.ItemGuid);
                 CreateElement<DigitalInElementEditor>(item);
             }
+            else if (item is ControllerItem)
+            {
+                (item as ControllerItem).TechController = Adapter.TechControllers.FirstOrDefault(x => x.Guid == item.ItemGuid);
+                CreateElement<ControllerElementEditor>(item);
+            }
         }
 
         /// <summary>
@@ -651,6 +675,11 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     var motorGroupItem = element.HostedElement as MotorGroupItem;
                     InitMotorGroupItem(motorGroupItem);
                 }
+                else if (element is ControllerItem)
+                {
+                    var controllerItem = element.HostedElement as ControllerItem;
+                    InitControllerItem(controllerItem);
+                }
             }
         }
 
@@ -971,6 +1000,29 @@ namespace Tango.MachineStudio.Technician.ViewModels
             };
         }
 
+        /// <summary>
+        /// Initializes the controller item.
+        /// </summary>
+        /// <param name="item">The controller item.</param>
+        private void InitControllerItem(ControllerItem item)
+        {
+            item.ValueChanged += async (x, value) =>
+            {
+                try
+                {
+                    await MachineOperator.SetComponentValue(new SetComponentValueRequest()
+                    {
+                        Component = (ValueComponent)item.TechController.Code,
+                        Value = value
+                    });
+                }
+                catch (Exception ex)
+                {
+                    //TODO: Show Exception.
+                }
+            };
+        }
+
         #endregion
 
         #region Public Methods
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
index 5996c351b..3d4ecdac1 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/Views/MachineTechView.xaml
@@ -364,6 +364,9 @@
                                 <DataTemplate DataType="{x:Type sys:Nullable}">
 
                                 </DataTemplate>
+                                <DataTemplate DataType="{x:Type items:ControllerItem}">
+                                    <templates:ControllerTemplate/>
+                                </DataTemplate>
                                 <DataTemplate DataType="{x:Type items:MonitorItem}">
                                     <templates:MonitorTemplate/>
                                 </DataTemplate>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/organization.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/organization.png
new file mode 100644
index 000000000..9f7ee9851
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/organization.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/roles.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/roles.png
new file mode 100644
index 000000000..e7955be04
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/roles.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/user.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/user.png
new file mode 100644
index 000000000..c8b7a3b40
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/user.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/users-and-roles.jpg b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/users-and-roles.jpg
new file mode 100644
index 000000000..2304e25b6
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/users-and-roles.jpg
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/users.png b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/users.png
new file mode 100644
index 000000000..805700c66
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Images/users.png
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationManager.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationManager.cs
new file mode 100644
index 000000000..b335f2d69
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationManager.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.Logging;
+using Tango.MachineStudio.Common.Navigation;
+using Tango.MachineStudio.UsersAndRoles.Views;
+
+namespace Tango.MachineStudio.UsersAndRoles.Navigation
+{
+    public class UsersAndRolesNavigationManager
+    {
+        private LogManager LogManager = LogManager.Default;
+
+        public void NavigateTo(UsersAndRolesNavigationView view)
+        {
+            LogManager.Log(String.Format("Navigating to view {0}...", view.ToString()));
+            MainView.Instance.TransitionControl.AutoNavigate(view.ToString());
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationView.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationView.cs
new file mode 100644
index 000000000..1e266926e
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Navigation/UsersAndRolesNavigationView.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.MachineStudio.UsersAndRoles.Navigation
+{
+    public enum UsersAndRolesNavigationView
+    {
+        OrganizationSelectionView,
+        OrganizationManagementView,
+        UserManagementView,
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..aeb6b6c4d
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/AssemblyInfo.cs
@@ -0,0 +1,18 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+[assembly: AssemblyTitle("Tango - Machine Studio Users & Roles Module")]
+
+[assembly: ComVisible(false)]
+
+[assembly:ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                             //(used if a resource is not found in the page,
+                             // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                      //(used if a resource is not found in the page,
+                                      // app, or any theme specific resource dictionaries)
+)]
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/Resources.Designer.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..5148a36ea
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/Resources.Designer.cs
@@ -0,0 +1,62 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.MachineStudio.UsersAndRoles.Properties {
+    
+    
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if ((resourceMan == null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Tango.MachineStudio.UsersAndRoles.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/Resources.resx b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/Resources.resx
new file mode 100644
index 000000000..af7dbebba
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/Settings.Designer.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..77bb41a9c
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Tango.MachineStudio.UsersAndRoles.Properties
+{
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/Settings.settings b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/Settings.settings
new file mode 100644
index 000000000..033d7a5e9
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Providers/Place.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Providers/Place.cs
new file mode 100644
index 000000000..a2ac2a9b7
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Providers/Place.cs
@@ -0,0 +1,31 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+
+namespace Tango.MachineStudio.UsersAndRoles.Providers
+{
+    public class Place
+    {
+        [XmlElement("address")]
+        [JsonProperty("address")]
+        public PlaceAddress Address { get; set; }
+
+        [XmlAttribute("display_name")]
+        [JsonProperty("display_name")]
+        public String DisplayName { get; set; }
+
+        public Place()
+        {
+            Address = new PlaceAddress();
+        }
+
+        public override string ToString()
+        {
+            return DisplayName;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Providers/PlaceAddress.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Providers/PlaceAddress.cs
new file mode 100644
index 000000000..5b25794d1
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Providers/PlaceAddress.cs
@@ -0,0 +1,53 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Xml.Serialization;
+
+namespace Tango.MachineStudio.UsersAndRoles.Providers
+{
+    public class PlaceAddress
+    {
+        [XmlElement("road")]
+        [JsonProperty("road")]
+        public String Road { get; set; }
+
+        [XmlElement("village")]
+        [JsonProperty("village")]
+        public String Village
+        {
+            get { return City; }
+            set { City = value; }
+        }
+
+        [XmlElement("town")]
+        [JsonProperty("town")]
+        public String Town
+        {
+            get { return City; }
+            set { City = value; }
+        }
+
+        [XmlElement("city")]
+        [JsonProperty("city")]
+        public String City { get; set; }
+
+        [XmlElement("state")]
+        [JsonProperty("state")]
+        public String State { get; set; }
+
+        [XmlElement("postcode")]
+        [JsonProperty("postcode")]
+        public String PostalCode { get; set; }
+
+        [XmlElement("country")]
+        [JsonProperty("country")]
+        public String Country { get; set; }
+
+        [XmlElement("country_code")]
+        [JsonProperty("country_code")]
+        public String CountryCode { get; set; }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Providers/PlacesProvider.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Providers/PlacesProvider.cs
new file mode 100644
index 000000000..681815d4c
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Providers/PlacesProvider.cs
@@ -0,0 +1,47 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.AutoComplete.Editors;
+using Tango.Logging;
+
+namespace Tango.MachineStudio.UsersAndRoles.Providers
+{
+    public class PlacesProvider : ISuggestionProvider
+    {
+        public IEnumerable GetSuggestions(string filter)
+        {
+            List<Place> places = new List<Place>();
+
+            using (WebClient web = new WebClient())
+            {
+                try
+                {
+                    String json = null;
+
+                    web.Headers.Add(HttpRequestHeader.UserAgent, "Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:47.0) Gecko/20100101 Firefox/47.0");
+                    web.Headers.Add(HttpRequestHeader.ContentType, "application/json");
+                    web.Headers.Add(HttpRequestHeader.AcceptLanguage, "en-US");
+
+                    json = web.DownloadString(String.Format("https://nominatim.openstreetmap.org/search?q={0}&format=json&addressdetails=1", filter));
+
+                    if (json != null)
+                    {
+                        List<Place> results = JsonConvert.DeserializeObject<List<Place>>(json);
+                        places.AddRange(results);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Default.Log(ex, LogCategory.Debug);
+                }
+            }
+
+            return places;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj
new file mode 100644
index 000000000..9064519c0
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Tango.MachineStudio.UsersAndRoles.csproj
@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{88028F14-0028-4DED-B119-19B8EE23CF32}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <RootNamespace>Tango.MachineStudio.UsersAndRoles</RootNamespace>
+    <AssemblyName>Tango.MachineStudio.UsersAndRoles</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\Build\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\Build\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\EntityFramework.6.0.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.3.0.19032, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="MahApps.Metro, Version=1.5.0.23, Culture=neutral, PublicKeyToken=f4fb5a3c4d1e5b4f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignThemes.Wpf, Version=2.3.1.953, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MaterialDesignThemes.2.3.1.953\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\MvvmLightLibs.5.3.0.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\..\..\Versioning\GlobalVersionInfo.cs">
+      <Link>GlobalVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="Navigation\UsersAndRolesNavigationManager.cs" />
+    <Compile Include="Navigation\UsersAndRolesNavigationView.cs" />
+    <Compile Include="Providers\PlaceAddress.cs" />
+    <Compile Include="Providers\PlacesProvider.cs" />
+    <Compile Include="Providers\Place.cs" />
+    <Compile Include="UsersAndRolesModule.cs" />
+    <Compile Include="ViewModelLocator.cs" />
+    <Compile Include="ViewModels\MainViewVM.cs" />
+    <Compile Include="Views\AddressView.xaml.cs">
+      <DependentUpon>AddressView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\ContactView.xaml.cs">
+      <DependentUpon>ContactView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MainView.xaml.cs">
+      <DependentUpon>MainView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\OrganizationManagementView.xaml.cs">
+      <DependentUpon>OrganizationManagementView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\OrganizationSelectionView.xaml.cs">
+      <DependentUpon>OrganizationSelectionView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserManagementView.xaml.cs">
+      <DependentUpon>UserManagementView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\UserView.xaml.cs">
+      <DependentUpon>UserView.xaml</DependentUpon>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\SideChains\Tango.AutoComplete\Tango.AutoComplete.csproj">
+      <Project>{bb2abb74-ba58-4812-83aa-ec8171f42df4}</Project>
+      <Name>Tango.AutoComplete</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
+      <Project>{f441feee-322a-4943-b566-110e12fd3b72}</Project>
+      <Name>Tango.BL</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Core\Tango.Core.csproj">
+      <Project>{a34ee0f0-649d-41c8-8489-b6f1cc6924ee}</Project>
+      <Name>Tango.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.DragAndDrop\Tango.DragAndDrop.csproj">
+      <Project>{b112d89a-a106-41ae-a0c1-4abc84c477f5}</Project>
+      <Name>Tango.DragAndDrop</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Logging\Tango.Logging.csproj">
+      <Project>{bc932dbd-7cdb-488c-99e4-f02cf441f55e}</Project>
+      <Name>Tango.Logging</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.Settings\Tango.Settings.csproj">
+      <Project>{d8f1ad85-526a-4f50-b6dc-d437af63d8d8}</Project>
+      <Name>Tango.Settings</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\Tango.SharedUI\Tango.SharedUI.csproj">
+      <Project>{8491d07b-c1f6-4b62-a412-41b9fd2d6538}</Project>
+      <Name>Tango.SharedUI</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Tango.MachineStudio.Common\Tango.MachineStudio.Common.csproj">
+      <Project>{cb0b0aa2-bb24-4bca-a720-45e397684e12}</Project>
+      <Name>Tango.MachineStudio.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Views\AddressView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\ContactView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\MainView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\OrganizationManagementView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\OrganizationSelectionView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\UserManagementView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\UserView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\organization.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\users-and-roles.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\users.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\user.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\roles.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/UsersAndRolesModule.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/UsersAndRolesModule.cs
new file mode 100644
index 000000000..c0d1326cf
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/UsersAndRolesModule.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Media.Imaging;
+using Tango.BL.Enumerations;
+using Tango.MachineStudio.Common;
+using Tango.MachineStudio.UsersAndRoles.Views;
+using Tango.SharedUI.Helpers;
+
+namespace Tango.MachineStudio.UsersAndRoles
+{
+    public class UsersAndRolesModule : StudioModuleBase
+    {
+        public override string Name
+        {
+            get
+            {
+                return "Users & Roles";
+            }
+        }
+
+        public override string Description
+        {
+            get
+            {
+                return "Manage organizations users and their roles.";
+            }
+        }
+
+        public override BitmapSource Image
+        {
+            get
+            {
+                return ResourceHelper.GetImageFromResources("Images/users-and-roles.jpg");
+            }
+        }
+
+        public override FrameworkElement MainView
+        {
+            get
+            {
+                return new MainView();
+            }
+        }
+
+        public override Permissions Permission
+        {
+            get
+            {
+                return Permissions.RunUsersAndRolesModule;
+            }
+        }
+
+        public override void Dispose()
+        {
+           
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModelLocator.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModelLocator.cs
new file mode 100644
index 000000000..588d2db09
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModelLocator.cs
@@ -0,0 +1,36 @@
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Ioc;
+using Microsoft.Practices.ServiceLocation;
+using Tango.MachineStudio.UsersAndRoles.Navigation;
+using Tango.MachineStudio.UsersAndRoles.ViewModels;
+
+namespace Tango.MachineStudio.UsersAndRoles
+{
+    /// <summary>
+    /// This class contains static references to all the view models in the
+    /// application and provides an entry point for the bindings.
+    /// </summary>
+    public static class ViewModelLocator
+    {
+        /// <summary>
+        /// Initializes a new instance of the ViewModelLocator class.
+        /// </summary>
+        static ViewModelLocator()
+        {
+            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
+
+            SimpleIoc.Default.Register<MainViewVM>();
+
+            SimpleIoc.Default.Unregister<UsersAndRolesNavigationManager>();
+            SimpleIoc.Default.Register<UsersAndRolesNavigationManager>(() => new UsersAndRolesNavigationManager());
+        }
+
+        public static MainViewVM MainViewVM
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<MainViewVM>();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
new file mode 100644
index 000000000..7d82cbbbc
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/ViewModels/MainViewVM.cs
@@ -0,0 +1,370 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.BL;
+using Tango.BL.Entities;
+using Tango.Core.Commands;
+using Tango.MachineStudio.Common.Notifications;
+using Tango.MachineStudio.UsersAndRoles.Navigation;
+using Tango.MachineStudio.UsersAndRoles.Providers;
+using Tango.SharedUI;
+
+namespace Tango.MachineStudio.UsersAndRoles.ViewModels
+{
+    public class MainViewVM : ViewModel
+    {
+        private ObservablesContext _organizationsContext;
+        private ObservablesContext _manageContext;
+        private ObservablesContext _userContext;
+        private UsersAndRolesNavigationManager _navigation;
+        private INotificationProvider _notification;
+
+        private ObservableCollection<Organization> _organizations;
+        public ObservableCollection<Organization> Organizations
+        {
+            get { return _organizations; }
+            set { _organizations = value; RaisePropertyChangedAuto(); }
+        }
+
+        private Organization _selectedOrganization;
+        public Organization SelectedOrganization
+        {
+            get { return _selectedOrganization; }
+            set { _selectedOrganization = value; RaisePropertyChangedAuto(); }
+        }
+
+        private Organization _managedOrganization;
+        public Organization ManagedOrganization
+        {
+            get { return _managedOrganization; }
+            set { _managedOrganization = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<Role> _roles;
+        public ObservableCollection<Role> Roles
+        {
+            get { return _roles; }
+            set { _roles = value; RaisePropertyChangedAuto(); }
+        }
+
+        private ObservableCollection<Role> _managedUserRoles;
+        public ObservableCollection<Role> ManagedUserRoles
+        {
+            get { return _managedUserRoles; }
+            set { _managedUserRoles = value; RaisePropertyChangedAuto(); }
+        }
+
+        private User _selectedUser;
+        public User SelectedUser
+        {
+            get { return _selectedUser; }
+            set { _selectedUser = value; RaisePropertyChangedAuto(); }
+        }
+
+        private User _managedUser;
+        public User ManagedUser
+        {
+            get { return _managedUser; }
+            set { _managedUser = value; RaisePropertyChangedAuto(); }
+        }
+
+        private Place _selectedUserPlace;
+        public Place SelectedUserPlace
+        {
+            get { return _selectedUserPlace; }
+            set
+            {
+                _selectedUserPlace = value;
+
+                if (_selectedUserPlace != null && _selectedUserPlace.Address != null)
+                {
+                    SetUserPlace(value);
+                }
+            }
+        }
+
+        private Place _selectedOrganizationPlace;
+        public Place SelectedOrganizationPlace
+        {
+            get { return _selectedOrganizationPlace; }
+            set
+            {
+                _selectedOrganizationPlace = value;
+
+                if (_selectedOrganizationPlace != null && _selectedOrganizationPlace.Address != null)
+                {
+                    SetOrganizationPlace(value);
+                }
+            }
+        }
+
+        public RelayCommand ManageOrganizationCommand { get; set; }
+
+        public RelayCommand BackToOrganizationsCommand { get; set; }
+
+        public RelayCommand ManageUserCommand { get; set; }
+
+        public RelayCommand SaveOrganizationCommand { get; set; }
+
+        public RelayCommand AddOrganizationCommand { get; set; }
+
+        public RelayCommand RemoveOrganizationCommand { get; set; }
+
+        public RelayCommand BackToManagedOrganizationCommand { get; set; }
+
+        public RelayCommand<Role> RemoveRoleCommand { get; set; }
+
+        public RelayCommand SaveManagedUserCommand { get; set; }
+
+        public RelayCommand AddUserCommand { get; set; }
+
+        public RelayCommand RemoveUserCommand { get; set; }
+
+        public MainViewVM(UsersAndRolesNavigationManager navigation, INotificationProvider notification)
+        {
+            _navigation = navigation;
+            _notification = notification;
+
+            LoadOrganizations();
+
+            ManageOrganizationCommand = new RelayCommand(LoadSelectedOrganization, () => SelectedOrganization != null);
+            BackToOrganizationsCommand = new RelayCommand(BackToOrganizations);
+            ManageUserCommand = new RelayCommand(LoadSelectedUser, () => SelectedUser != null);
+            SaveOrganizationCommand = new RelayCommand(SaveOrganization);
+            AddOrganizationCommand = new RelayCommand(AddOrganization);
+            RemoveOrganizationCommand = new RelayCommand(RemoveOrganization, () => SelectedOrganization != null);
+            BackToManagedOrganizationCommand = new RelayCommand(BackToManagedOrganization);
+            RemoveRoleCommand = new RelayCommand<Role>(RemoveUserRole);
+            SaveManagedUserCommand = new RelayCommand(SaveManagedUser);
+            AddUserCommand = new RelayCommand(AddNewUser);
+            RemoveUserCommand = new RelayCommand(RemoveSelectedUser, () => SelectedUser != null);
+        }
+
+        private async void AddOrganization()
+        {
+            String name = _notification.ShowTextInput("Enter organization name", "Name");
+
+            if (!String.IsNullOrWhiteSpace(name))
+            {
+                using (_notification.PushTaskItem("Adding new organization..."))
+                {
+                    Organization org = new Organization();
+                    org.Name = name;
+                    org.Address = new Address();
+                    org.Contact = new Contact();
+                    _organizationsContext.Organizations.Add(org);
+                    await org.SaveAsync(_organizationsContext);
+                    Organizations = _organizationsContext.Organizations.ToObservableCollection();
+                    SelectedOrganization = org;
+                    LoadSelectedOrganization();
+                }
+            }
+        }
+
+        private async void RemoveOrganization()
+        {
+            if (_notification.ShowQuestion("Are you sure you want to remove " + SelectedOrganization.Name + " organization?"))
+            {
+                using (_notification.PushTaskItem("Removing organization..."))
+                {
+                    await SelectedOrganization.DeleteCascadeAsync(_organizationsContext);
+                    LoadOrganizations();
+                }
+            }
+        }
+
+        private async void SaveOrganization()
+        {
+            using (_notification.PushTaskItem("Saving organization address and contact..."))
+            {
+                await ManagedOrganization.SaveAsync(_manageContext);
+                LoadOrganizations();
+                SelectedOrganization = Organizations.SingleOrDefault(x => x.Guid == ManagedOrganization.Guid);
+            }
+        }
+
+        private void LoadSelectedUser()
+        {
+            using (_notification.PushTaskItem("Loading user details..."))
+            {
+                Task.Factory.StartNew(() =>
+                {
+                    _userContext = ObservablesContext.CreateDefault();
+                    Roles = _userContext.Roles.ToObservableCollection();
+                    ManagedUser = _userContext.Users.SingleOrDefault(x => x.Guid == SelectedUser.Guid);
+                    ManagedUserRoles = ManagedUser.Roles.ToObservableCollection();
+
+                    InvokeUI(() => _navigation.NavigateTo(UsersAndRolesNavigationView.UserManagementView));
+                });
+            }
+        }
+
+        private void BackToOrganizations()
+        {
+            _navigation.NavigateTo(UsersAndRolesNavigationView.OrganizationSelectionView);
+        }
+
+        private void BackToManagedOrganization()
+        {
+            _navigation.NavigateTo(UsersAndRolesNavigationView.OrganizationManagementView);
+        }
+
+        private void RemoveUserRole(Role role)
+        {
+            ManagedUserRoles.Remove(role);
+
+            foreach (var userRole in ManagedUser.UsersRoles.Where(x => x.Role == role).ToList())
+            {
+                userRole.DefferedDelete(_userContext);
+            }
+        }
+
+        private async void SaveManagedUser()
+        {
+            try
+            {
+                ManagedUser.Validate(_userContext);
+            }
+            catch (Exception ex)
+            {
+                _notification.ShowError(ex.Message);
+                return;
+            }
+
+            using (_notification.PushTaskItem("Saving user details..."))
+            {
+                await ManagedUser.SaveAsync(_userContext);
+                LoadSelectedOrganization();
+            }
+        }
+
+        private void LoadSelectedOrganization()
+        {
+            using (_notification.PushTaskItem("Loading organization..."))
+            {
+                Task.Factory.StartNew(() =>
+                {
+                    _manageContext = ObservablesContext.CreateDefault();
+                    ManagedOrganization = _manageContext.Organizations.SingleOrDefault(x => x.Guid == SelectedOrganization.Guid);
+
+                    InvokeUI(() => _navigation.NavigateTo(UsersAndRolesNavigationView.OrganizationManagementView));
+                });
+            }
+        }
+
+        private void LoadOrganizations()
+        {
+            _organizationsContext = ObservablesContext.CreateDefault();
+            _organizationsContext.Configuration.LazyLoadingEnabled = false;
+
+            _organizationsContext.Users.ToList();
+            _organizationsContext.Contacts.ToList();
+            _organizationsContext.Addresses.ToList();
+            _organizationsContext.Machines.ToList();
+
+            Organizations = _organizationsContext.Organizations.ToObservableCollection();
+        }
+
+        public void OnDropRole(Role role)
+        {
+            ManagedUser.UsersRoles.Add(new UsersRole()
+            {
+                Role = role,
+                RoleGuid = role.Guid,
+                User = ManagedUser,
+                UserGuid = ManagedUser.Guid,
+            });
+
+            ManagedUserRoles.Add(role);
+        }
+
+        private async void RemoveSelectedUser()
+        {
+            if (_notification.ShowQuestion("Are you sure you want to remove the selected user?"))
+            {
+                using (_notification.PushTaskItem("Removing user..."))
+                {
+                    await SelectedUser.DeleteCascadeAsync(_manageContext);
+                    LoadSelectedOrganization();
+                }
+            }
+        }
+
+        private async void AddNewUser()
+        {
+            String email = _notification.ShowTextInput("Enter user email", "email");
+
+            if (!String.IsNullOrWhiteSpace(email))
+            {
+                User user = new User();
+                user.Email = email;
+                user.Password = "1111";
+                user.Contact = new Contact()
+                {
+                    FirstName = "Twine",
+                    LastName = "User",
+                    Email = email,
+                };
+
+                user.UsersRoles.Add(new UsersRole()
+                {
+                    User = user,
+                    Role = _manageContext.Roles.SingleOrDefault(x => x.Code == (int)BL.Enumerations.Roles.User)
+                });
+
+                try
+                {
+                    user.Validate(_manageContext);
+                }
+                catch (Exception ex)
+                {
+                    _notification.ShowError(ex.Message);
+                    return;
+                }
+
+                user.Address = new Address();
+
+                ManagedOrganization.Users.Add(user);
+
+                using (_notification.PushTaskItem("Adding new user..."))
+                {
+                    await ManagedOrganization.SaveAsync(_manageContext);
+                    LoadOrganizations();
+                    SelectedOrganization = Organizations.SingleOrDefault(x => x.Guid == ManagedOrganization.Guid);
+                }
+            }
+        }
+
+        private void SetUserPlace(Place place)
+        {
+            ManagedUser.Address.AddressString = place.Address.Road;
+            ManagedUser.Address.City = place.Address.City;
+            ManagedUser.Address.Country = place.Address.Country;
+            ManagedUser.Address.CountryCode = place.Address.CountryCode;
+            ManagedUser.Address.Locality = place.Address.CountryCode;
+            ManagedUser.Address.PostalCode = place.Address.PostalCode;
+            ManagedUser.Address.State = place.Address.State;
+        }
+
+        private void SetOrganizationPlace(Place place)
+        {
+            ManagedOrganization.Address.AddressString = place.Address.Road;
+            ManagedOrganization.Address.City = place.Address.City;
+            ManagedOrganization.Address.Country = place.Address.Country;
+            ManagedOrganization.Address.CountryCode = place.Address.CountryCode;
+            ManagedOrganization.Address.Locality = place.Address.CountryCode;
+            ManagedOrganization.Address.PostalCode = place.Address.PostalCode;
+            ManagedOrganization.Address.State = place.Address.State;
+        }
+
+        protected override void RaisePropertyChangedAuto([CallerMemberName] string caller = null)
+        {
+            base.RaisePropertyChangedAuto(caller);
+            InvalidateRelayCommands();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/AddressView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/AddressView.xaml
new file mode 100644
index 000000000..937cf14dd
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/AddressView.xaml
@@ -0,0 +1,33 @@
+<UserControl x:Class="Tango.MachineStudio.UsersAndRoles.Views.AddressView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.UsersAndRoles.ViewModels"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.MachineStudio.UsersAndRoles.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=entities:Address, IsDesignTimeCreatable=False}">
+    <Grid>
+        <controls:TableGrid>
+            <TextBlock Text="COUNTRY"></TextBlock>
+            <TextBox Text="{Binding Country}" />
+            <TextBlock Text="COUNTRY CODE"></TextBlock>
+            <TextBox IsReadOnly="True" Text="{Binding CountryCode}"></TextBox>
+            <TextBlock Text="STATE"></TextBlock>
+            <TextBox Text="{Binding State}"></TextBox>
+            <TextBlock Text="CITY"></TextBlock>
+            <TextBox Text="{Binding City}" />
+            <TextBlock Text="POSTAL CODE"></TextBlock>
+            <TextBox Text="{Binding PostalCode}"></TextBox>
+            <TextBlock Text="LOCALITY"></TextBlock>
+            <TextBox Text="{Binding Locality}" />
+            <TextBlock Text="ADDRESS"></TextBlock>
+            <TextBox Text="{Binding AddressString}"></TextBox>
+        </controls:TableGrid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/AddressView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/AddressView.xaml.cs
new file mode 100644
index 000000000..e5d644626
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/AddressView.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.UsersAndRoles.Views
+{
+    /// <summary>
+    /// Interaction logic for AddressView.xaml
+    /// </summary>
+    public partial class AddressView : UserControl
+    {
+        public AddressView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/ContactView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/ContactView.xaml
new file mode 100644
index 000000000..cdfa28c50
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/ContactView.xaml
@@ -0,0 +1,29 @@
+<UserControl x:Class="Tango.MachineStudio.UsersAndRoles.Views.ContactView"
+             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:vm="clr-namespace:Tango.MachineStudio.UsersAndRoles.ViewModels"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.MachineStudio.UsersAndRoles.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=entities:Contact, IsDesignTimeCreatable=False}">
+    <Grid>
+        <controls:TableGrid>
+            <TextBlock>FIRST NAME</TextBlock>
+            <TextBox Text="{Binding FirstName}"></TextBox>
+            <TextBlock>LAST NAME</TextBlock>
+            <TextBox Text="{Binding LastName}"></TextBox>
+            <TextBlock>EMAIL</TextBlock>
+            <TextBox Text="{Binding Email}"></TextBox>
+            <TextBlock>PHONE NUMBER</TextBlock>
+            <TextBox Text="{Binding PhoneNumber}"></TextBox>
+            <TextBlock>FAX</TextBlock>
+            <TextBox Text="{Binding Fax}"></TextBox>
+        </controls:TableGrid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/ContactView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/ContactView.xaml.cs
new file mode 100644
index 000000000..fad93d63d
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/ContactView.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.UsersAndRoles.Views
+{
+    /// <summary>
+    /// Interaction logic for ContactView.xaml
+    /// </summary>
+    public partial class ContactView : UserControl
+    {
+        public ContactView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml
new file mode 100644
index 000000000..90166f445
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml
@@ -0,0 +1,28 @@
+<UserControl x:Class="Tango.MachineStudio.UsersAndRoles.Views.MainView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:global="clr-namespace:Tango.MachineStudio.UsersAndRoles"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.UsersAndRoles.ViewModels"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:local="clr-namespace:Tango.MachineStudio.UsersAndRoles.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+    <Grid>
+        <controls:MultiTransitionControl x:Name="TransitionControl" TransitionType="Slide">
+            <controls:MultiTransitionControl.Controls>
+                <ContentControl Tag="OrganizationSelectionView">
+                    <local:OrganizationSelectionView/>
+                </ContentControl>
+                <ContentControl Tag="OrganizationManagementView">
+                    <local:OrganizationManagementView/>
+                </ContentControl>
+                <ContentControl Tag="UserManagementView">
+                    <local:UserManagementView/>
+                </ContentControl>
+            </controls:MultiTransitionControl.Controls>
+        </controls:MultiTransitionControl>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml.cs
new file mode 100644
index 000000000..9fe030a3a
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/MainView.xaml.cs
@@ -0,0 +1,31 @@
+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.UsersAndRoles.Views
+{
+    /// <summary>
+    /// Interaction logic for MainView.xaml
+    /// </summary>
+    public partial class MainView : UserControl
+    {
+        public static MainView Instance { get; set; }
+
+        public MainView()
+        {
+            InitializeComponent();
+            Instance = this;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml
new file mode 100644
index 000000000..64b05769a
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml
@@ -0,0 +1,151 @@
+<UserControl x:Class="Tango.MachineStudio.UsersAndRoles.Views.OrganizationManagementView"
+             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.UsersAndRoles"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.UsersAndRoles.ViewModels"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls"
+              xmlns:providers="clr-namespace:Tango.MachineStudio.UsersAndRoles.Providers"
+             xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:local="clr-namespace:Tango.MachineStudio.UsersAndRoles.Views"
+              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}" Background="Transparent">
+
+    <UserControl.Resources>
+        <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
+        <providers:PlacesProvider x:Key="PlacesProvider" />
+    </UserControl.Resources>
+
+    <Grid>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="400"/>
+                <ColumnDefinition Width="1*"/>
+            </Grid.ColumnDefinitions>
+
+            <Border Background="#A6FFFFFF" BorderBrush="Gray" BorderThickness="0 0 1 0">
+                <Grid Margin="10 20 10 10">
+                    <StackPanel HorizontalAlignment="Center">
+
+                        <StackPanel Orientation="Horizontal" Margin="-30 0 0 30">
+                            <Image Source="../Images/organization.png" Width="58" />
+                            <TextBlock Margin="10 0 0 0" FontSize="40" VerticalAlignment="Center" Text="{Binding ManagedOrganization.Name}"></TextBlock>
+                        </StackPanel>
+
+                        <TextBlock FontSize="14" FontWeight="SemiBold">ADDRESS</TextBlock>
+
+                        <Border BorderBrush="Gray" BorderThickness="1" Width="300" HorizontalAlignment="Left" Padding="5" Margin="0 10 0 0" Background="#A9FFFFFF" Height="300">
+                            <DockPanel>
+                                <DockPanel DockPanel.Dock="Top">
+                                    <materialDesign:PackIcon Kind="Magnify" DockPanel.Dock="Left" Width="24" Height="24" />
+                                    <autoComplete:AutoCompleteTextBox x:Name="address_auto" Margin="5 0 0 0" Delay="500" DisplayMember="DisplayName" SelectedItem="{Binding SelectedOrganizationPlace,Mode=OneWayToSource}" Provider="{StaticResource PlacesProvider}" materialDesign:HintAssist.Hint="Find address" />
+                                </DockPanel>
+                                <local:AddressView DataContext="{Binding ManagedOrganization.Address}" />
+                            </DockPanel>
+                        </Border>
+
+                        <TextBlock FontSize="14" FontWeight="SemiBold" Margin="0 40 0 0">CONTACT</TextBlock>
+
+                        <Border BorderBrush="Gray" BorderThickness="1" Width="300" HorizontalAlignment="Left" Padding="5" Margin="0 10 0 0" Background="#A9FFFFFF" Height="250">
+                            <local:ContactView DataContext="{Binding ManagedOrganization.Contact}" />
+                        </Border>
+
+                        <Button  Margin="0 40 0 0" MinWidth="160" Height="50" Command="{Binding SaveOrganizationCommand}" Background="Gray" BorderBrush="Gray">
+                            <StackPanel Orientation="Horizontal">
+                                <materialDesign:PackIcon Kind="ContentSave" Width="20" Height="20" />
+                                <TextBlock Margin="5 0 0 0" FontSize="16">SAVE</TextBlock>
+                            </StackPanel>
+                        </Button>
+
+                    </StackPanel>
+                </Grid>
+            </Border>
+
+            <Grid Grid.Column="1">
+                <TextBlock HorizontalAlignment="Left" VerticalAlignment="Top" FontSize="30" FontStyle="Italic" Margin="150 40">
+                    <Run Text="{Binding ManagedOrganization.Name}"></Run> <Run Text="Users"></Run>
+                </TextBlock>
+                <DockPanel Margin="100" MaxWidth="1200">
+                    <Grid DockPanel.Dock="Top">
+                        <StackPanel>
+                            <Image Source="../Images/users.png" Width="300" Height="250" />
+                            <Button Margin="0 -210 0 0" MinWidth="160" Height="50" Command="{Binding BackToOrganizationsCommand}" HorizontalAlignment="Left">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="KeyboardBackspace" Width="20" Height="20" />
+                                    <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+                    <Grid DockPanel.Dock="Bottom">
+                        <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
+                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveUserCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
+                                    <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
+                                </StackPanel>
+                            </Button>
+                            <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding AddUserCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
+                                    <TextBlock Margin="5 0 0 0" FontSize="16">NEW USER</TextBlock>
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                            <Button Margin="50 0 0 0" MinWidth="200" Height="60" Command="{Binding ManageUserCommand}">
+                                <StackPanel Orientation="Horizontal">
+                                    <TextBlock FontSize="18" VerticalAlignment="Center">MANAGE</TextBlock>
+                                    <materialDesign:PackIcon Margin="5 0 0 0" Kind="ChevronRight" Width="30" Height="30" />
+                                </StackPanel>
+                            </Button>
+                        </StackPanel>
+                    </Grid>
+                    <Grid>
+                        <DataGrid Margin="0 0 0 10" ItemsSource="{Binding ManagedOrganization.Users}" SelectedItem="{Binding SelectedUser}"  d:DataContext="{d:DesignInstance Type=entities:User, IsDesignTimeCreatable=False}" BorderBrush="Silver" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" IsReadOnly="True">
+                            <DataGrid.CellStyle>
+                                <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                                    <Setter Property="BorderThickness" Value="0"/>
+                                    <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                                    <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                                </Style>
+                            </DataGrid.CellStyle>
+                            <DataGrid.Columns>
+                                <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" />
+                                <DataGridTextColumn Header="NAME" Binding="{Binding Contact.FullName}" Width="1*" />
+                                <DataGridTextColumn Header="LOGIN EMAIL" Binding="{Binding Email}" Width="1*" />
+                                <DataGridTextColumn Header="CONTACT EMAIL" Binding="{Binding Contact.Email}" Width="1*" />
+                                <DataGridTextColumn Header="ADDRESS" Binding="{Binding Address.AddressString}" Width="1*" />
+                                <DataGridTemplateColumn Header="ROLES" Width="1*">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock Text="{Binding Roles[0].Name}" TextTrimming="CharacterEllipsis">
+                                                <TextBlock.ToolTip>
+                                                    <ItemsControl ItemsSource="{Binding Roles}">
+                                                        <ItemsControl.ItemTemplate>
+                                                            <DataTemplate>
+                                                                <StackPanel Orientation="Horizontal" Margin="2">
+                                                                    <materialDesign:PackIcon Kind="AccountKey" Width="16" Height="16" />
+                                                                    <TextBlock Margin="5 0 0 0" Text="{Binding Name}"></TextBlock>
+                                                                </StackPanel>
+                                                            </DataTemplate>
+                                                        </ItemsControl.ItemTemplate>
+                                                    </ItemsControl>
+                                                </TextBlock.ToolTip>
+                                            </TextBlock>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                            </DataGrid.Columns>
+                        </DataGrid>
+                    </Grid>
+                </DockPanel>
+            </Grid>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml.cs
new file mode 100644
index 000000000..e2c44a584
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationManagementView.xaml.cs
@@ -0,0 +1,34 @@
+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 static Tango.SharedUI.Controls.MultiTransitionControl;
+
+namespace Tango.MachineStudio.UsersAndRoles.Views
+{
+    /// <summary>
+    /// Interaction logic for OrganizationManagementView.xaml
+    /// </summary>
+    public partial class OrganizationManagementView : UserControl , ITransitionView
+    {
+        public OrganizationManagementView()
+        {
+            InitializeComponent();
+        }
+
+        public void OnTransitionCompleted()
+        {
+            address_auto.Text = "";
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationSelectionView.xaml
new file mode 100644
index 000000000..16dd36360
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationSelectionView.xaml
@@ -0,0 +1,69 @@
+<UserControl x:Class="Tango.MachineStudio.UsersAndRoles.Views.OrganizationSelectionView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Tango.MachineStudio.UsersAndRoles.Views"
+             xmlns:global="clr-namespace:Tango.MachineStudio.UsersAndRoles"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.UsersAndRoles.ViewModels"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}" Background="Transparent">
+
+    <UserControl.Resources>
+        <converters:DateTimeUTCToShortDateTimeConverter x:Key="DateTimeUTCToShortDateTimeConverter" />
+    </UserControl.Resources>
+    
+    <Grid>
+        <DockPanel Margin="100" MaxWidth="1200">
+            <Grid DockPanel.Dock="Top">
+                <Image Source="../Images/organization.png" Width="300" />
+            </Grid>
+            <Grid DockPanel.Dock="Bottom">
+                <StackPanel VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Left" Margin="0 0 0 0">
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#FF7575" BorderBrush="#FF7575" Command="{Binding RemoveOrganizationCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Delete" Width="20" Height="20" />
+                            <TextBlock Margin="5 0 0 0" FontSize="16">DELETE</TextBlock>
+                        </StackPanel>
+                    </Button>
+                    <Button Margin="0 0 10 0" MinWidth="160" Height="50" Background="#65C682" BorderBrush="#65C682" Command="{Binding AddOrganizationCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <materialDesign:PackIcon Kind="Plus" Width="20" Height="20" />
+                            <TextBlock Margin="5 0 0 0" FontSize="16">NEW ORGANIZATION</TextBlock>
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+                    <Button Margin="50 0 0 0" MinWidth="200" Height="60" Command="{Binding ManageOrganizationCommand}">
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock FontSize="18" VerticalAlignment="Center">MANAGE</TextBlock>
+                            <materialDesign:PackIcon Margin="5 0 0 0" Kind="ChevronRight" Width="30" Height="30" />
+                        </StackPanel>
+                    </Button>
+                </StackPanel>
+            </Grid>
+            <Grid>
+                <DataGrid Margin="0 0 0 10" BorderBrush="Silver" IsReadOnly="True" BorderThickness="1" Background="#93FFFFFF" AlternatingRowBackground="#C9F6F6F6" AutoGenerateColumns="False" CanUserAddRows="False" CanUserDeleteRows="False" ItemsSource="{Binding Organizations}" SelectedItem="{Binding SelectedOrganization}">
+                    <DataGrid.CellStyle>
+                        <Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Type DataGridCell}}">
+                            <Setter Property="BorderThickness" Value="0"/>
+                            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
+                            <Setter Property="VerticalContentAlignment" Value="Center"></Setter>
+                        </Style>
+                    </DataGrid.CellStyle>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn Header="NAME" Binding="{Binding Name}" Width="1*" />
+                        <DataGridTextColumn Header="LAST UPDATED" Binding="{Binding LastUpdated,Converter={StaticResource DateTimeUTCToShortDateTimeConverter}}" Width="1*" />
+                        <DataGridTextColumn Header="CONTACT" Binding="{Binding Contact.FullName}" Width="1*" />
+                        <DataGridTextColumn Header="ADDRESS" Binding="{Binding Address.AddressString}" Width="1*" />
+                        <DataGridTextColumn Header="MACHINES" Binding="{Binding Machines.Count}" Width="1*" />
+                        <DataGridTextColumn Header="USERS" Binding="{Binding Users.Count}" Width="1*" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </Grid>
+        </DockPanel>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationSelectionView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationSelectionView.xaml.cs
new file mode 100644
index 000000000..16c8b2b24
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/OrganizationSelectionView.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.UsersAndRoles.Views
+{
+    /// <summary>
+    /// Interaction logic for OrganizationSelectionView.xaml
+    /// </summary>
+    public partial class OrganizationSelectionView : UserControl
+    {
+        public OrganizationSelectionView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml
new file mode 100644
index 000000000..ccb38b198
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml
@@ -0,0 +1,243 @@
+<UserControl x:Class="Tango.MachineStudio.UsersAndRoles.Views.UserManagementView"
+             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.UsersAndRoles"
+             xmlns:vm="clr-namespace:Tango.MachineStudio.UsersAndRoles.ViewModels"
+             xmlns:providers="clr-namespace:Tango.MachineStudio.UsersAndRoles.Providers"
+             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+             xmlns:dragAndDrop="clr-namespace:Tango.DragAndDrop;assembly=Tango.DragAndDrop"
+             xmlns:autoComplete="clr-namespace:Tango.AutoComplete.Editors;assembly=Tango.AutoComplete"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:mahApps="http://metro.mahapps.com/winfx/xaml/controls"
+             xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:local="clr-namespace:Tango.MachineStudio.UsersAndRoles.Views"
+             xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             mc:Ignorable="d" 
+             d:DesignHeight="1080" d:DesignWidth="1920" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
+
+    <UserControl.Resources>
+        <providers:PlacesProvider x:Key="PlacesProvider" />
+    </UserControl.Resources>
+    
+    <Grid>
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="1*"/>
+                <ColumnDefinition Width="400"/>
+            </Grid.ColumnDefinitions>
+
+            <Grid Margin="10">
+                <DockPanel Margin="100" MaxWidth="1200">
+                    <Grid DockPanel.Dock="Top">
+                        <Grid>
+                            <StackPanel>
+                                <StackPanel Orientation="Horizontal">
+                                    <Button MinWidth="160" Height="50" Command="{Binding BackToManagedOrganizationCommand}" HorizontalAlignment="Left">
+                                        <StackPanel Orientation="Horizontal">
+                                            <materialDesign:PackIcon Kind="KeyboardBackspace" Width="20" Height="20" />
+                                            <TextBlock Margin="5 0 0 0" FontSize="16">BACK</TextBlock>
+                                        </StackPanel>
+                                    </Button>
+                                    <Image Source="../Images/user.png" Width="100" RenderOptions.BitmapScalingMode="Fant" Margin="130 0 0 0"></Image>
+                                    <TextBlock Text="{Binding ManagedUser.Contact.FullName,FallbackValue='Roy Ben Shabat'}" VerticalAlignment="Center" FontSize="25" Margin="10 0 0 0"></TextBlock>
+                                </StackPanel>
+
+                                <StackPanel Orientation="Horizontal" Margin="0 20 0 0" HorizontalAlignment="Right">
+                                    <StackPanel>
+                                        <TextBlock FontSize="16" FontWeight="SemiBold">LOGIN</TextBlock>
+                                        <Border Width="300" BorderThickness="1" BorderBrush="Gray" Margin="0 5 0 0" Padding="15 5" Height="150" Background="#8EFFFFFF">
+                                            <local:UserView FontSize="10" DataContext="{Binding ManagedUser}" />
+                                        </Border>
+                                    </StackPanel>
+                                    <StackPanel Margin="10 0 0 0">
+                                        <TextBlock FontSize="16" FontWeight="SemiBold">CONTACT</TextBlock>
+                                        <Border Width="300" BorderThickness="1" BorderBrush="Gray" Margin="0 5 0 0" Padding="15 5" Height="250" Background="#8EFFFFFF">
+                                            <local:ContactView FontSize="10" DataContext="{Binding ManagedUser.Contact}" />
+                                        </Border>
+                                    </StackPanel>
+                                    <StackPanel Margin="10 0 0 0">
+                                        <TextBlock FontSize="16" FontWeight="SemiBold">ADDRESS</TextBlock>
+                                        <Border Width="300" BorderThickness="1" BorderBrush="Gray" Margin="0 5 0 0" Padding="15 5" Height="300" Background="#8EFFFFFF">
+                                            <DockPanel>
+                                                <DockPanel DockPanel.Dock="Top">
+                                                    <materialDesign:PackIcon Kind="Magnify" DockPanel.Dock="Left" Width="24" Height="24" />
+                                                    <autoComplete:AutoCompleteTextBox x:Name="address_auto" Margin="5 0 0 0" Delay="500" DisplayMember="DisplayName" SelectedItem="{Binding SelectedUserPlace,Mode=OneWayToSource}" Provider="{StaticResource PlacesProvider}" materialDesign:HintAssist.Hint="Find address" />
+                                                </DockPanel>
+                                                <local:AddressView FontSize="10" DataContext="{Binding ManagedUser.Address}" />
+                                            </DockPanel>
+                                        </Border>
+                                    </StackPanel>
+                                </StackPanel>
+                            </StackPanel>
+                        </Grid>
+                    </Grid>
+                    <Grid DockPanel.Dock="Bottom">
+                        <Button Margin="0 10 0 0" MinWidth="200" Height="60" Command="{Binding SaveManagedUserCommand}" HorizontalAlignment="Right">
+                            <StackPanel Orientation="Horizontal">
+                                <TextBlock FontSize="18" VerticalAlignment="Center">SAVE</TextBlock>
+                                <materialDesign:PackIcon Margin="5 0 0 0" Kind="ContentSave" Width="30" Height="30" />
+                            </StackPanel>
+                        </Button>
+                    </Grid>
+                    <Grid>
+                        <DockPanel Margin="0 20 0 0">
+                            <TextBlock DockPanel.Dock="Top" FontSize="16" FontWeight="SemiBold">ROLES</TextBlock>
+                            <Grid Margin="0 5 0 0" Style="{StaticResource droppableGrid}" dragAndDrop:DragAndDropService.Drop="OnDropRole" Background="#7BFFFFFF">
+                                <TextBlock HorizontalAlignment="Center" VerticalAlignment="Top" Foreground="Silver" FontSize="20">DRAG &amp; DROP ROLES</TextBlock>
+                                <Border BorderBrush="Gray" BorderThickness="1" Padding="10">
+                                    <ListBox ItemsSource="{Binding ManagedUserRoles}" ItemContainerStyle="{StaticResource basicListBoxItem}" ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled">
+                                        <ListBox.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <WrapPanel Orientation="Horizontal" />
+                                            </ItemsPanelTemplate>
+                                        </ListBox.ItemsPanel>
+                                        <ListBox.ItemTemplate>
+                                            <DataTemplate DataType="{x:Type entities:Role}">
+                                                <Grid>
+                                                    <Grid.ToolTip>
+                                                        <StackPanel>
+                                                            <TextBlock Text="{Binding Description}" FontSize="10" Margin="0 0 0 10"></TextBlock>
+                                                            <ItemsControl ItemsSource="{Binding RolesPermissions}">
+                                                                <ItemsControl.ItemTemplate>
+                                                                    <DataTemplate>
+                                                                        <Grid>
+                                                                            <StackPanel Orientation="Horizontal">
+                                                                                <materialDesign:PackIcon Kind="Security" Width="12" />
+                                                                                <TextBlock Margin="5 0 0 0" FontSize="10" Text="{Binding Permission.Name}"></TextBlock>
+                                                                            </StackPanel>
+                                                                        </Grid>
+                                                                    </DataTemplate>
+                                                                </ItemsControl.ItemTemplate>
+                                                            </ItemsControl>
+                                                        </StackPanel>
+                                                    </Grid.ToolTip>
+                                                    <Border Margin="5" CornerRadius="5" Width="100" Height="100" BorderThickness="1" Padding="2">
+                                                        <Border.Style>
+                                                            <Style TargetType="Border">
+                                                                <Setter Property="BorderBrush" Value="Silver"></Setter>
+                                                                <Style.Triggers>
+                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=ListBoxItem},Path=IsSelected}" Value="True">
+                                                                        <Setter Property="BorderBrush" Value="{StaticResource AccentColorBrush}"></Setter>
+                                                                    </DataTrigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </Border.Style>
+                                                        <Border.Background>
+                                                            <LinearGradientBrush>
+                                                                <GradientStop Color="White"/>
+                                                                <GradientStop Color="#FFD6D6D6" Offset="1"/>
+                                                            </LinearGradientBrush>
+                                                        </Border.Background>
+                                                        <Grid>
+                                                            <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                                                                <Image Source="../Images/roles.png" Width="32" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                                <TextBlock Text="{Binding Name}" TextWrapping="Wrap" HorizontalAlignment="Center" TextAlignment="Center" FontSize="13" Margin="5"></TextBlock>
+                                                            </StackPanel>
+                                                        </Grid>
+                                                    </Border>
+
+                                                    <Button HorizontalAlignment="Right" VerticalAlignment="Top" Margin="10" Cursor="Hand" ToolTip="Remove Role" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.RemoveRoleCommand}" CommandParameter="{Binding}">
+                                                        <Button.Style>
+                                                            <Style TargetType="Button" BasedOn="{StaticResource emptyButton}">
+                                                                <Setter Property="Visibility" Value="Hidden"></Setter>
+                                                                <Style.Triggers>
+                                                                    <DataTrigger Binding="{Binding RelativeSource={RelativeSource AncestorType=Grid},Path=IsMouseOver}" Value="True">
+                                                                        <Setter Property="Visibility" Value="Visible"></Setter>
+                                                                    </DataTrigger>
+                                                                </Style.Triggers>
+                                                            </Style>
+                                                        </Button.Style>
+                                                        <materialDesign:PackIcon Kind="Delete" Foreground="#FF5C5C" Width="16" Height="16" />
+                                                    </Button>
+                                                </Grid>
+                                            </DataTemplate>
+                                        </ListBox.ItemTemplate>
+                                    </ListBox>
+                                </Border>
+                            </Grid>
+                        </DockPanel>
+                    </Grid>
+                </DockPanel>
+            </Grid>
+
+            <Grid Grid.Column="1" Background="White">
+                <DockPanel Margin="10">
+                    <StackPanel Orientation="Horizontal" DockPanel.Dock="Top">
+                        <Image Source="../Images/roles.png" Width="70" RenderOptions.BitmapScalingMode="Fant"></Image>
+                        <TextBlock FontSize="16" FontWeight="SemiBold" VerticalAlignment="Center" Margin="10 0 0 0">AVAILABLE ROLES</TextBlock>
+                    </StackPanel>
+
+                    <Grid>
+                        <ListBox ItemsSource="{Binding Roles}" ItemContainerStyle="{StaticResource basicListBoxItem}" HorizontalContentAlignment="Stretch" Background="Transparent">
+                            <ListBox.ItemTemplate>
+                                <DataTemplate>
+                                    <Grid Background="Transparent" IsHitTestVisible="True" Style="{StaticResource draggableGrid}" dragAndDrop:DragAndDropService.DraggableBorderBrush="{StaticResource AccentColorBrush}" dragAndDrop:DragAndDropService.Draggable="True" dragAndDrop:DragAndDropService.DraggingSurface="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DraggingSurface}">
+                                        <Grid.ToolTip>
+                                            <StackPanel>
+                                                <TextBlock Text="{Binding Description}" FontSize="10" Margin="0 0 0 10"></TextBlock>
+                                                <ItemsControl ItemsSource="{Binding RolesPermissions}">
+                                                    <ItemsControl.ItemTemplate>
+                                                        <DataTemplate>
+                                                            <StackPanel Orientation="Horizontal">
+                                                                <materialDesign:PackIcon Kind="Security" Width="12" />
+                                                                <TextBlock Margin="5 0 0 0" FontSize="10" Text="{Binding Permission.Name}"></TextBlock>
+                                                            </StackPanel>
+                                                        </DataTemplate>
+                                                    </ItemsControl.ItemTemplate>
+                                                </ItemsControl>
+                                            </StackPanel>
+                                        </Grid.ToolTip>
+                                        <DockPanel>
+                                            <Border DockPanel.Dock="Left" Width="100" Height="100" IsHitTestVisible="False" BorderBrush="Silver" BorderThickness="1" CornerRadius="5" Margin="5" Padding="2">
+                                                <Border.Background>
+                                                    <LinearGradientBrush>
+                                                        <GradientStop Color="White"/>
+                                                        <GradientStop Color="#FFD6D6D6" Offset="1"/>
+                                                    </LinearGradientBrush>
+                                                </Border.Background>
+                                                <Grid>
+                                                    <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center">
+                                                        <Image Source="../Images/roles.png" Width="32" RenderOptions.BitmapScalingMode="Fant"></Image>
+                                                        <TextBlock Text="{Binding Name}" TextWrapping="Wrap" HorizontalAlignment="Center" TextAlignment="Center" FontSize="13" Margin="5"></TextBlock>
+                                                    </StackPanel>
+                                                </Grid>
+                                            </Border>
+
+                                            <Grid MaxHeight="85" HorizontalAlignment="Left" Margin="20 0 0 0">
+                                                <ItemsControl ItemsSource="{Binding RolesPermissions}">
+                                                    <ItemsControl.ItemTemplate>
+                                                        <DataTemplate>
+                                                            <StackPanel Orientation="Horizontal">
+                                                                <materialDesign:PackIcon Kind="Security" Width="12" />
+                                                                <TextBlock Margin="5 0 0 0" FontSize="10" TextTrimming="CharacterEllipsis" MaxWidth="150" Text="{Binding Permission.Name}"></TextBlock>
+                                                            </StackPanel>
+                                                        </DataTemplate>
+                                                    </ItemsControl.ItemTemplate>
+                                                </ItemsControl>
+
+                                                <Grid>
+                                                    <Grid.Background>
+                                                        <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                                            <GradientStop/>
+                                                            <GradientStop Color="White" Offset="1"/>
+                                                        </LinearGradientBrush>
+                                                    </Grid.Background>
+                                                </Grid>
+                                            </Grid>
+                                        </DockPanel>
+                                    </Grid>
+                                </DataTemplate>
+                            </ListBox.ItemTemplate>
+                        </ListBox>
+                    </Grid>
+                </DockPanel>
+
+                <Rectangle HorizontalAlignment="Left" Stroke="#BBBBBB" StrokeThickness="1"></Rectangle>
+            </Grid>
+        </Grid>
+
+        <dragAndDrop:DraggingSurface x:Name="dragSurface" />
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml.cs
new file mode 100644
index 000000000..f2ff25637
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserManagementView.xaml.cs
@@ -0,0 +1,57 @@
+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.BL.Entities;
+using Tango.DragAndDrop;
+using Tango.MachineStudio.UsersAndRoles.ViewModels;
+using static Tango.SharedUI.Controls.MultiTransitionControl;
+
+namespace Tango.MachineStudio.UsersAndRoles.Views
+{
+    /// <summary>
+    /// Interaction logic for UserManagementView.xaml
+    /// </summary>
+    public partial class UserManagementView : UserControl, ITransitionView
+    {
+        private MainViewVM _vm;
+        
+        public DraggingSurface DraggingSurface
+        {
+            get { return (DraggingSurface)GetValue(DraggingSurfaceProperty); }
+            set { SetValue(DraggingSurfaceProperty, value); }
+        }
+        public static readonly DependencyProperty DraggingSurfaceProperty =
+            DependencyProperty.Register("DraggingSurface", typeof(DraggingSurface), typeof(UserManagementView), new PropertyMetadata(null));
+
+        public UserManagementView()
+        {
+            InitializeComponent();
+            DraggingSurface = dragSurface;
+            Loaded += (_, __) => _vm = DataContext as MainViewVM;
+        }
+
+        private void OnDropRole(object sender, DropEventArgs e)
+        {
+            if (e.Draggable.DataContext is Role)
+            {
+                _vm.OnDropRole(e.Draggable.DataContext as Role);
+            }
+        }
+
+        public void OnTransitionCompleted()
+        {
+            address_auto.Text = "";
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserView.xaml
new file mode 100644
index 000000000..6c7596015
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserView.xaml
@@ -0,0 +1,23 @@
+<UserControl x:Class="Tango.MachineStudio.UsersAndRoles.Views.UserView"
+             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:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
+             xmlns:pass="clr-namespace:Tango.SharedUI.Helpers;assembly=Tango.SharedUI"
+             xmlns:local="clr-namespace:Tango.MachineStudio.UsersAndRoles.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300" d:DataContext="{d:DesignInstance Type=entities:User, IsDesignTimeCreatable=False}">
+    
+    
+    
+    <Grid>
+        <controls:TableGrid>
+            <TextBlock Text="EMAIL"></TextBlock>
+            <TextBox Text="{Binding Email}"></TextBox>
+            <TextBlock Text="PASSWORD"></TextBlock>
+            <PasswordBox MaxLength="30" pass:PasswordHelper.Attach="True" pass:PasswordHelper.Password="{Binding Password,Mode=TwoWay}"></PasswordBox>
+        </controls:TableGrid>
+    </Grid>
+</UserControl>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserView.xaml.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserView.xaml.cs
new file mode 100644
index 000000000..b617bdbc4
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/Views/UserView.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.UsersAndRoles.Views
+{
+    /// <summary>
+    /// Interaction logic for UserView.xaml
+    /// </summary>
+    public partial class UserView : UserControl
+    {
+        public UserView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/app.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/app.config
new file mode 100644
index 000000000..cacd4cd77
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/packages.config b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/packages.config
new file mode 100644
index 000000000..6b8afad69
--- /dev/null
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.UsersAndRoles/packages.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="CommonServiceLocator" version="1.3" targetFramework="net46" />
+  <package id="EntityFramework" version="6.0.0" targetFramework="net46" />
+  <package id="MahApps.Metro" version="1.5.0" targetFramework="net46" />
+  <package id="MaterialDesignColors" version="1.1.2" targetFramework="net46" />
+  <package id="MaterialDesignThemes" version="2.3.1.953" targetFramework="net46" />
+  <package id="MvvmLightLibs" version="5.3.0.0" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net46" />
+</packages>
\ No newline at end of file