Index: trunk/src/event/editor/CCTVPanel.java
===================================================================
--- trunk/src/event/editor/CCTVPanel.java	(revision 7)
+++ trunk/src/event/editor/CCTVPanel.java	(revision 50)
@@ -23,5 +23,5 @@
         initComponents();
 
-        dir.addFocusListener(new FocusListener()
+        txtDirField.addFocusListener(new FocusListener()
         {
 
@@ -38,5 +38,5 @@
         });
 
-        toggle.addFocusListener(new FocusListener()
+        txtToggleField.addFocusListener(new FocusListener()
         {
 
@@ -67,4 +67,7 @@
     {
         event = (CCTVEvent) sei;
+        txtIDField.setText("NOT CURRENTLY IMPLEMENTED. NO EFFECT.");
+        txtDirField.setText("NOT CURRENTLY IMPLEMENTED. NO EFFECT.");
+        txtToggleField.setText("NOT CURRENTLY IMPLEMENTED. NO EFFECT.");
         //TODO: Add listeners for text fields
     }
@@ -82,23 +85,28 @@
     @SuppressWarnings("unchecked")
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
-    private void initComponents() {
+    private void initComponents()
+    {
 
         removeButton = new javax.swing.JButton();
         jLabel1 = new javax.swing.JLabel();
-        dir = new javax.swing.JFormattedTextField();
+        txtDirField = new javax.swing.JFormattedTextField();
         jLabel3 = new javax.swing.JLabel();
-        jTextField1 = new javax.swing.JTextField();
+        txtIDField = new javax.swing.JTextField();
         jLabel2 = new javax.swing.JLabel();
-        toggle = new javax.swing.JFormattedTextField();
+        txtToggleField = new javax.swing.JFormattedTextField();
         help = new javax.swing.JLabel();
 
         removeButton.setText("Remove");
-        removeButton.addMouseListener(new java.awt.event.MouseAdapter() {
-            public void mouseClicked(java.awt.event.MouseEvent evt) {
+        removeButton.addMouseListener(new java.awt.event.MouseAdapter()
+        {
+            public void mouseClicked(java.awt.event.MouseEvent evt)
+            {
                 removeButtonremoveThisProperty(evt);
             }
         });
-        removeButton.addActionListener(new java.awt.event.ActionListener() {
-            public void actionPerformed(java.awt.event.ActionEvent evt) {
+        removeButton.addActionListener(new java.awt.event.ActionListener()
+        {
+            public void actionPerformed(java.awt.event.ActionEvent evt)
+            {
                 removeButtonActionPerformed(evt);
             }
@@ -107,5 +115,5 @@
         jLabel1.setText("ID");
 
-        dir.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.NumberFormatter()));
+        txtDirField.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.NumberFormatter()));
 
         jLabel3.setText("Toggle");
@@ -113,5 +121,5 @@
         jLabel2.setText("Dir");
 
-        toggle.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.NumberFormatter()));
+        txtToggleField.setFormatterFactory(new javax.swing.text.DefaultFormatterFactory(new javax.swing.text.NumberFormatter()));
 
         org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
@@ -131,7 +139,7 @@
                         .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                         .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(jTextField1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 487, Short.MAX_VALUE)
-                            .add(dir, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 487, Short.MAX_VALUE)
-                            .add(toggle, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 487, Short.MAX_VALUE))))
+                            .add(txtIDField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 487, Short.MAX_VALUE)
+                            .add(txtDirField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 487, Short.MAX_VALUE)
+                            .add(txtToggleField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 487, Short.MAX_VALUE))))
                 .addContainerGap())
         );
@@ -144,13 +152,13 @@
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(jLabel1)
-                    .add(jTextField1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                    .add(txtIDField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(jLabel2)
-                    .add(dir, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                    .add(txtDirField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                 .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                 .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                     .add(jLabel3)
-                    .add(toggle, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                    .add(txtToggleField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                 .add(48, 48, 48)
                 .add(help, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 13, Short.MAX_VALUE)
@@ -172,12 +180,12 @@
 
     // Variables declaration - do not modify//GEN-BEGIN:variables
-    private javax.swing.JFormattedTextField dir;
     private javax.swing.JLabel help;
     private javax.swing.JLabel jLabel1;
     private javax.swing.JLabel jLabel2;
     private javax.swing.JLabel jLabel3;
-    private javax.swing.JTextField jTextField1;
     private javax.swing.JButton removeButton;
-    private javax.swing.JFormattedTextField toggle;
+    private javax.swing.JFormattedTextField txtDirField;
+    private javax.swing.JTextField txtIDField;
+    private javax.swing.JFormattedTextField txtToggleField;
     // End of variables declaration//GEN-END:variables
 
Index: trunk/src/event/editor/CMSEvaluationPanel.java
===================================================================
--- trunk/src/event/editor/CMSEvaluationPanel.java	(revision 7)
+++ trunk/src/event/editor/CMSEvaluationPanel.java	(revision 50)
@@ -40,13 +40,53 @@
         event = (CMSEvaluationEvent) sei;
         txtID.setText(event.cmsID);
+        txtID.addKeyListener(new KeyListener()
+        {
+
+            @Override
+            public void keyTyped(KeyEvent e)
+            {
+            }
+
+            @Override
+            public void keyPressed(KeyEvent e)
+            {
+                if (e.getKeyCode() == KeyEvent.VK_ENTER)
+                {
+                    event.cmsID = txtID.getText();
+                }
+            }
+
+            @Override
+            public void keyReleased(KeyEvent e)
+            {
+            }
+        });
         txtLocation.setText(event.location);
+        txtLocation.addKeyListener(new KeyListener()
+        {
+
+            @Override
+            public void keyTyped(KeyEvent e)
+            {
+            }
+
+            @Override
+            public void keyPressed(KeyEvent e)
+            {
+                if (e.getKeyCode() == KeyEvent.VK_ENTER)
+                {
+                    event.location = txtLocation.getText();
+                }
+            }
+
+            @Override
+            public void keyReleased(KeyEvent e)
+            {
+            }
+        });
         txtMessage.setText("");
         for (int i = 0; i < event.message.size(); i++)
         {
-            for (MouseListener ml : addButton.getMouseListeners())
-            {
-                ml.mouseClicked(new MouseEvent(addButton, 1, 1, 1, 1, 1, 1, true));
-            }
-            ((MyTableModel) dialogTable.getModel()).setValueAt(event.message.get(i), i, 1);
+            ((MyTableModel) dialogTable.getModel()).addRow("" + (i + 1), event.message.get(i));
         }
         for (int i = 0; i < TypeDropdown.getItemCount(); i++)
@@ -57,4 +97,22 @@
             }
         }
+        TypeDropdown.addActionListener(new ActionListener()
+        {
+
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+                event.cmsType = TypeDropdown.getSelectedItem().toString();
+            }
+        });
+        addButton.addActionListener(new ActionListener()
+        {
+
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+                event.message.add("");
+            }
+        });
         dialogTable.getModel().addTableModelListener(new TableModelListener()
         {
@@ -64,7 +122,7 @@
                 if (e.getType() == TableModelEvent.UPDATE)
                 {
-                    event.message.set(e.getLastRow(), dialogTable.getModel().getValueAt(e.getLastRow(), 0).toString());
-                }
-                if(e.getType() == TableModelEvent.DELETE)
+                    event.message.set(e.getLastRow(), dialogTable.getModel().getValueAt(e.getLastRow(), 1).toString());
+                }
+                if (e.getType() == TableModelEvent.DELETE)
                 {
                     event.message.remove(e.getLastRow());
@@ -72,5 +130,4 @@
             }
         });
-
     }
 
Index: trunk/src/event/editor/CCTVPanel.form
===================================================================
--- trunk/src/event/editor/CCTVPanel.form	(revision 1)
+++ trunk/src/event/editor/CCTVPanel.form	(revision 50)
@@ -30,7 +30,7 @@
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="jTextField1" alignment="0" pref="487" max="32767" attributes="0"/>
-                          <Component id="dir" alignment="0" pref="487" max="32767" attributes="0"/>
-                          <Component id="toggle" alignment="0" pref="487" max="32767" attributes="0"/>
+                          <Component id="txtIDField" alignment="0" pref="487" max="32767" attributes="0"/>
+                          <Component id="txtDirField" alignment="0" pref="487" max="32767" attributes="0"/>
+                          <Component id="txtToggleField" alignment="0" pref="487" max="32767" attributes="0"/>
                       </Group>
                   </Group>
@@ -48,15 +48,15 @@
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="jTextField1" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="txtIDField" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="jLabel2" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="dir" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="txtDirField" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
               <Group type="103" groupAlignment="3" attributes="0">
                   <Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
-                  <Component id="toggle" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="txtToggleField" alignment="3" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace min="-2" pref="48" max="-2" attributes="0"/>
@@ -82,5 +82,5 @@
       </Properties>
     </Component>
-    <Component class="javax.swing.JFormattedTextField" name="dir">
+    <Component class="javax.swing.JFormattedTextField" name="txtDirField">
       <Properties>
         <Property name="formatterFactory" type="javax.swing.JFormattedTextField$AbstractFormatterFactory" editor="org.netbeans.modules.form.editors.AbstractFormatterFactoryEditor">
@@ -94,5 +94,5 @@
       </Properties>
     </Component>
-    <Component class="javax.swing.JTextField" name="jTextField1">
+    <Component class="javax.swing.JTextField" name="txtIDField">
     </Component>
     <Component class="javax.swing.JLabel" name="jLabel2">
@@ -101,5 +101,5 @@
       </Properties>
     </Component>
-    <Component class="javax.swing.JFormattedTextField" name="toggle">
+    <Component class="javax.swing.JFormattedTextField" name="txtToggleField">
       <Properties>
         <Property name="formatterFactory" type="javax.swing.JFormattedTextField$AbstractFormatterFactory" editor="org.netbeans.modules.form.editors.AbstractFormatterFactoryEditor">
Index: trunk/src/event/editor/WitnessPanel.java
===================================================================
--- trunk/src/event/editor/WitnessPanel.java	(revision 7)
+++ trunk/src/event/editor/WitnessPanel.java	(revision 50)
@@ -30,10 +30,12 @@
     }
 
-    
     public void getEventObject(I_ScriptEvent sei)
     {
         event = (WitnessEvent) sei;
         StringTokenizer st = new StringTokenizer(event.witnessName);
-        txtFirstName.setText(st.nextToken());
+        if (st.hasMoreTokens())
+        {
+            txtFirstName.setText(st.nextToken());
+        }
         txtFirstName.addKeyListener(new KeyListener()
         {
@@ -41,11 +43,13 @@
             {
             }
-            public void keyPressed(KeyEvent e)
-            {
-                if (e.getKeyCode() == KeyEvent.VK_ENTER)
-                {
-                    event.witnessName = txtFirstName.getText() + " "+txtLastName.getText();
-                }
-            }
+
+            public void keyPressed(KeyEvent e)
+            {
+                if (e.getKeyCode() == KeyEvent.VK_ENTER)
+                {
+                    event.witnessName = txtFirstName.getText() + " " + txtLastName.getText();
+                }
+            }
+
             public void keyReleased(KeyEvent e)
             {
@@ -62,11 +66,13 @@
             {
             }
-            public void keyPressed(KeyEvent e)
-            {
-                if (e.getKeyCode() == KeyEvent.VK_ENTER)
-                {
-                    event.witnessName = txtFirstName.getText() + " "+txtLastName.getText();
-                }
-            }
+
+            public void keyPressed(KeyEvent e)
+            {
+                if (e.getKeyCode() == KeyEvent.VK_ENTER)
+                {
+                    event.witnessName = txtFirstName.getText() + " " + txtLastName.getText();
+                }
+            }
+
             public void keyReleased(KeyEvent e)
             {
@@ -79,4 +85,5 @@
             {
             }
+
             public void keyPressed(KeyEvent e)
             {
@@ -86,4 +93,5 @@
                 }
             }
+
             public void keyReleased(KeyEvent e)
             {
@@ -96,4 +104,5 @@
             {
             }
+
             public void keyPressed(KeyEvent e)
             {
@@ -103,4 +112,5 @@
                 }
             }
+
             public void keyReleased(KeyEvent e)
             {
Index: trunk/src/event/editor/ParamicsPanel.java
===================================================================
--- trunk/src/event/editor/ParamicsPanel.java	(revision 7)
+++ trunk/src/event/editor/ParamicsPanel.java	(revision 50)
@@ -43,4 +43,5 @@
             }
         }
+
         if (!containsItem)
         {
@@ -48,4 +49,13 @@
             LocationDropdown.setSelectedItem(LocationDropdown.getItemCount() - 1);
         }
+        LocationDropdown.addActionListener(new ActionListener()
+        {
+
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+                event.locationID = LocationDropdown.getSelectedItem().toString();
+            }
+        });
         for (int i = 0; i < StatusDropdown.getItemCount(); i++)
         {
@@ -55,4 +65,13 @@
             }
         }
+        StatusDropdown.addActionListener(new ActionListener()
+        {
+
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+                event.status = StatusDropdown.getSelectedItem().toString();
+            }
+        });
         for (int i = 0; i < TypeDropdown.getItemCount(); i++)
         {
@@ -62,4 +81,13 @@
             }
         }
+        TypeDropdown.addActionListener(new ActionListener()
+        {
+
+            @Override
+            public void actionPerformed(ActionEvent e)
+            {
+                event.type = TypeDropdown.getSelectedItem().toString();
+            }
+        });
         ArrayList<JCheckBox> lanes = new ArrayList<JCheckBox>();
         lanes.add(jCheckBox1);
@@ -323,41 +351,171 @@
 
     private void jCheckBox1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox1ActionPerformed
-        // TODO add your handling code here:
+        if (jCheckBox1.isSelected())
+        {
+            if (!event.laneNums.contains(1))
+            {
+                event.laneNums.add(1);
+            }
+        }
+        else
+        {
+            if (event.laneNums.contains(1))
+            {
+                event.laneNums.remove(1);
+            }
+        }
     }//GEN-LAST:event_jCheckBox1ActionPerformed
 
     private void jCheckBox2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox2ActionPerformed
-        // TODO add your handling code here:
+        if (jCheckBox2.isSelected())
+        {
+            if (!event.laneNums.contains(2))
+            {
+                event.laneNums.add(2);
+            }
+        }
+        else
+        {
+            if (event.laneNums.contains(2))
+            {
+                event.laneNums.remove(2);
+            }
+        }
     }//GEN-LAST:event_jCheckBox2ActionPerformed
 
     private void jCheckBox3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox3ActionPerformed
-        // TODO add your handling code here:
+        if (jCheckBox3.isSelected())
+        {
+            if (!event.laneNums.contains(3))
+            {
+                event.laneNums.add(3);
+            }
+        }
+        else
+        {
+            if (event.laneNums.contains(3))
+            {
+                event.laneNums.remove(3);
+            }
+        }
     }//GEN-LAST:event_jCheckBox3ActionPerformed
 
     private void jCheckBox4ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox4ActionPerformed
-        // TODO add your handling code here:
+        if (jCheckBox4.isSelected())
+        {
+            if (!event.laneNums.contains(4))
+            {
+                event.laneNums.add(4);
+            }
+        }
+        else
+        {
+            if (event.laneNums.contains(4))
+            {
+                event.laneNums.remove(4);
+            }
+        }
     }//GEN-LAST:event_jCheckBox4ActionPerformed
 
     private void jCheckBox5ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox5ActionPerformed
-        // TODO add your handling code here:
+        if (jCheckBox5.isSelected())
+        {
+            if (!event.laneNums.contains(5))
+            {
+                event.laneNums.add(5);
+            }
+        }
+        else
+        {
+            if (event.laneNums.contains(5))
+            {
+                event.laneNums.remove(5);
+            }
+        }
     }//GEN-LAST:event_jCheckBox5ActionPerformed
 
     private void jCheckBox6ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox6ActionPerformed
-        // TODO add your handling code here:
+        if (jCheckBox6.isSelected())
+        {
+            if (!event.laneNums.contains(6))
+            {
+                event.laneNums.add(6);
+            }
+        }
+        else
+        {
+            if (event.laneNums.contains(6))
+            {
+                event.laneNums.remove(6);
+            }
+        }
     }//GEN-LAST:event_jCheckBox6ActionPerformed
 
     private void jCheckBox7ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox7ActionPerformed
-        // TODO add your handling code here:
+        if (jCheckBox7.isSelected())
+        {
+            if (!event.laneNums.contains(7))
+            {
+                event.laneNums.add(7);
+            }
+        }
+        else
+        {
+            if (event.laneNums.contains(7))
+            {
+                event.laneNums.remove(7);
+            }
+        }
     }//GEN-LAST:event_jCheckBox7ActionPerformed
 
     private void jCheckBox8ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox8ActionPerformed
-        // TODO add your handling code here:
+        if (jCheckBox8.isSelected())
+        {
+            if (!event.laneNums.contains(8))
+            {
+                event.laneNums.add(8);
+            }
+        }
+        else
+        {
+            if (event.laneNums.contains(8))
+            {
+                event.laneNums.remove(8);
+            }
+        }
     }//GEN-LAST:event_jCheckBox8ActionPerformed
 
     private void jCheckBox9ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox9ActionPerformed
-        // TODO add your handling code here:
+        if (jCheckBox9.isSelected())
+        {
+            if (!event.laneNums.contains(9))
+            {
+                event.laneNums.add(9);
+            }
+        }
+        else
+        {
+            if (event.laneNums.contains(9))
+            {
+                event.laneNums.remove(9);
+            }
+        }
     }//GEN-LAST:event_jCheckBox9ActionPerformed
 
     private void jCheckBox10ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox10ActionPerformed
-        // TODO add your handling code here:
+        if (jCheckBox10.isSelected())
+        {
+            if (!event.laneNums.contains(10))
+            {
+                event.laneNums.add(10);
+            }
+        }
+        else
+        {
+            if (event.laneNums.contains(10))
+            {
+                event.laneNums.remove(10);
+            }
+        }
     }//GEN-LAST:event_jCheckBox10ActionPerformed