diff --git a/AIS/AISAdmin/AISAdmin.csproj b/AIS/AISAdmin/AISAdmin.csproj
index 4fefaadd..8e1e787c 100644
--- a/AIS/AISAdmin/AISAdmin.csproj
+++ b/AIS/AISAdmin/AISAdmin.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <None Remove="Resources\arrow_down_green.png" />
+    <None Remove="Resources\arrow_left_green.png" />
     <None Remove="Resources\arrow_right_green.png" />
     <None Remove="Resources\arrow_up_green.png" />
     <None Remove="Resources\check.png" />
@@ -31,6 +32,7 @@
 
   <ItemGroup>
     <Resource Include="Resources\arrow_down_green.png" />
+    <Resource Include="Resources\arrow_left_green.png" />
     <Resource Include="Resources\arrow_right_green.png" />
     <Resource Include="Resources\arrow_up_green.png" />
     <Resource Include="Resources\check.png" />
diff --git a/AIS/AISAdmin/Main.Designer.cs b/AIS/AISAdmin/Main.Designer.cs
index 46f68f24..68eff238 100644
--- a/AIS/AISAdmin/Main.Designer.cs
+++ b/AIS/AISAdmin/Main.Designer.cs
@@ -238,12 +238,13 @@
             // buttonAssignSelectedTarget
             // 
             this.buttonAssignSelectedTarget.Enabled = false;
-            this.buttonAssignSelectedTarget.Image = global::AISAdmin.Properties.Resources.delete;
+            this.buttonAssignSelectedTarget.Image = global::AISAdmin.Properties.Resources.arrow_left_green;
             this.buttonAssignSelectedTarget.Location = new System.Drawing.Point(358, 111);
             this.buttonAssignSelectedTarget.Name = "buttonAssignSelectedTarget";
             this.buttonAssignSelectedTarget.Size = new System.Drawing.Size(37, 31);
             this.buttonAssignSelectedTarget.TabIndex = 6;
             this.buttonAssignSelectedTarget.UseVisualStyleBackColor = true;
+            this.buttonAssignSelectedTarget.Click += new System.EventHandler(this.buttonAssignSelectedTarget_Click);
             // 
             // buttonDeleteAssignment
             // 
@@ -254,6 +255,7 @@
             this.buttonDeleteAssignment.Size = new System.Drawing.Size(37, 31);
             this.buttonDeleteAssignment.TabIndex = 5;
             this.buttonDeleteAssignment.UseVisualStyleBackColor = true;
+            this.buttonDeleteAssignment.Click += new System.EventHandler(this.buttonDeleteAssignment_Click);
             // 
             // buttonNewAssignment
             // 
diff --git a/AIS/AISAdmin/Main.cs b/AIS/AISAdmin/Main.cs
index aa3dfaa4..77a85d88 100644
--- a/AIS/AISAdmin/Main.cs
+++ b/AIS/AISAdmin/Main.cs
@@ -214,5 +214,23 @@ namespace AISAdmin
                 _storage?.Save(ma);
             }
         }
+
+        private void buttonDeleteAssignment_Click(object sender, EventArgs e)
+        {
+            MonitorAssignment? ma = (MonitorAssignment)this.listBoxAssignment.SelectedItem;
+            if(ma != null)
+            {                
+
+            }
+        }
+
+        private void buttonAssignSelectedTarget_Click(object sender, EventArgs e)
+        {
+            AIS_Target? target = (AIS_Target)this.listBoxTargets.SelectedItem;
+            if(target != null)
+            {
+                this.AddOrUpdateAssignmentForAllGroupZones(target.MMSI, MonitorAssignment.ZoneMonitorType.ENTER);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/AIS/AISAdmin/Properties/Resources.Designer.cs b/AIS/AISAdmin/Properties/Resources.Designer.cs
index 41c52e02..02647d9c 100644
--- a/AIS/AISAdmin/Properties/Resources.Designer.cs
+++ b/AIS/AISAdmin/Properties/Resources.Designer.cs
@@ -70,6 +70,16 @@ namespace AISAdmin.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap arrow_left_green {
+            get {
+                object obj = ResourceManager.GetObject("arrow_left_green", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/AIS/AISAdmin/Properties/Resources.resx b/AIS/AISAdmin/Properties/Resources.resx
index a93138a4..18acdd0b 100644
--- a/AIS/AISAdmin/Properties/Resources.resx
+++ b/AIS/AISAdmin/Properties/Resources.resx
@@ -121,6 +121,9 @@
   <data name="arrow_down_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_down_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="arrow_left_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow_left_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="arrow_right_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_right_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/AIS/AISAdmin/Resources/arrow_left_green.png b/AIS/AISAdmin/Resources/arrow_left_green.png
new file mode 100644
index 00000000..39eb6e6d
Binary files /dev/null and b/AIS/AISAdmin/Resources/arrow_left_green.png differ