Working on android DAL.

149 files changed, 12027 insertions, 11310 deletions

diff --git a/Software/Android_Studio/Tango.DAL/build.gradle b/Software/Android_Studio/Tango.DAL/build.gradle
index 261c3b528..d3a5ac889 100644
--- a/Software/Android_Studio/Tango.DAL/build.gradle
+++ b/Software/Android_Studio/Tango.DAL/build.gradle
@@ -29,6 +29,10 @@ android {
     dataBinding {
         enabled = true
     }
+
+    dexOptions {
+        preDexLibraries false
+    }
 }
 
 def dbflow_version = "4.1.2"
@@ -49,6 +53,7 @@ dependencies {
     compile 'com.android.support:support-annotations:25.4.0'
     compile globalDependencies.storage
     compile globalDependencies.joda
+    compile globalDependencies.linq
     compile 'commons-io:commons-io:2.4'
     implementation project(':Tango.Logging')
 }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
index a785d3d4c..00cb546f1 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
@@ -5,6 +5,7 @@ import android.databinding.Observable;
 import android.databinding.PropertyChangeRegistry;
 
 import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ColumnIgnore;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
 import com.raizlabs.android.dbflow.rx2.structure.BaseRXModel;
 
@@ -20,11 +21,11 @@ import io.reactivex.Single;
  * Represents a DAL base entity.
  * contains the basic columns/properties which are in common to all entities.
  */
-public class Entity extends BaseRXModel implements Observable
+public abstract class Entity extends BaseRXModel implements Observable
 {
     private transient PropertyChangeRegistry mCallbacks;
     
-    @Column(name = "ID")
+    @ColumnIgnore
     private int id;
     
     @Column(name = "GUID")
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java
index 427cb4d02..c74625a72 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java
@@ -73,7 +73,6 @@ import java.util.List;
 
 public class TangoDAO
 {
-
     /**
     * Gets all the ActionTypes from database.
     *
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java
index 96d07a193..61f306764 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionType.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "ACTION_TYPES", database = TangoDB.class, cachingEnabled = true)
+public class ActionType extends ActionTypeBase
+{
 
-    @Table(name = "ACTION_TYPES", database = TangoDB.class)
-    public class ActionType extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionTypeBase.java
new file mode 100644
index 000000000..b12024870
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ActionTypeBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class ActionTypeBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java
index 0677b48b7..289c4e59d 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Address.java
@@ -1,242 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "ADDRESSES", database = TangoDB.class, cachingEnabled = true)
+public class Address extends AddressBase
+{
 
-    @Table(name = "ADDRESSES", database = TangoDB.class)
-    public class Address extends Entity 
-    {
     
-            @Column(name = "DELETED")
-            private boolean deleted;
-
-    
-    
-            @Column(name = "ADDRESS_STRING")
-            private String addressString;
-
-    
-    
-            @Column(name = "LOCALITY")
-            private String locality;
-
-    
-    
-            @Column(name = "COUNTRY")
-            private String country;
-
-    
-    
-            @Column(name = "CITY")
-            private String city;
-
-    
-    
-            @Column(name = "STATE")
-            private String state;
-
-    
-    
-            @Column(name = "COUNTRY_CODE")
-            private String countryCode;
-
-    
-    
-            @Column(name = "POSTAL_CODE")
-            private String postalCode;
-
-    
-
-     
-         /**
-         * Gets the Deleted.
-         *
-         * return the Deleted
-         */
-         @Bindable
-         public boolean isDeleted()
-         {
-            return deleted;
-         }
-
-         /**
-         * Sets the Deleted.
-         *
-         * @param deleted the Deleted
-         */
-         public void setDeleted(boolean deleted)
-         {
-            this.deleted = deleted;
-            notifyPropertyChanged(BR.deleted);
-         }
-     
-     
-         /**
-         * Gets the AddressString.
-         *
-         * return the AddressString
-         */
-         @Bindable
-         public String getAddressString()
-         {
-            return addressString;
-         }
-
-         /**
-         * Sets the AddressString.
-         *
-         * @param addressString the AddressString
-         */
-         public void setAddressString(String addressString)
-         {
-            this.addressString = addressString;
-            notifyPropertyChanged(BR.addressString);
-         }
-     
-     
-         /**
-         * Gets the Locality.
-         *
-         * return the Locality
-         */
-         @Bindable
-         public String getLocality()
-         {
-            return locality;
-         }
-
-         /**
-         * Sets the Locality.
-         *
-         * @param locality the Locality
-         */
-         public void setLocality(String locality)
-         {
-            this.locality = locality;
-            notifyPropertyChanged(BR.locality);
-         }
-     
-     
-         /**
-         * Gets the Country.
-         *
-         * return the Country
-         */
-         @Bindable
-         public String getCountry()
-         {
-            return country;
-         }
-
-         /**
-         * Sets the Country.
-         *
-         * @param country the Country
-         */
-         public void setCountry(String country)
-         {
-            this.country = country;
-            notifyPropertyChanged(BR.country);
-         }
-     
-     
-         /**
-         * Gets the City.
-         *
-         * return the City
-         */
-         @Bindable
-         public String getCity()
-         {
-            return city;
-         }
-
-         /**
-         * Sets the City.
-         *
-         * @param city the City
-         */
-         public void setCity(String city)
-         {
-            this.city = city;
-            notifyPropertyChanged(BR.city);
-         }
-     
-     
-         /**
-         * Gets the State.
-         *
-         * return the State
-         */
-         @Bindable
-         public String getState()
-         {
-            return state;
-         }
-
-         /**
-         * Sets the State.
-         *
-         * @param state the State
-         */
-         public void setState(String state)
-         {
-            this.state = state;
-            notifyPropertyChanged(BR.state);
-         }
-     
-     
-         /**
-         * Gets the CountryCode.
-         *
-         * return the CountryCode
-         */
-         @Bindable
-         public String getCountryCode()
-         {
-            return countryCode;
-         }
-
-         /**
-         * Sets the CountryCode.
-         *
-         * @param countryCode the CountryCode
-         */
-         public void setCountryCode(String countryCode)
-         {
-            this.countryCode = countryCode;
-            notifyPropertyChanged(BR.countryCode);
-         }
-     
-     
-         /**
-         * Gets the PostalCode.
-         *
-         * return the PostalCode
-         */
-         @Bindable
-         public String getPostalCode()
-         {
-            return postalCode;
-         }
-
-         /**
-         * Sets the PostalCode.
-         *
-         * @param postalCode the PostalCode
-         */
-         public void setPostalCode(String postalCode)
-         {
-            this.postalCode = postalCode;
-            notifyPropertyChanged(BR.postalCode);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/AddressBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/AddressBase.java
new file mode 100644
index 000000000..63dfa8309
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/AddressBase.java
@@ -0,0 +1,239 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class AddressBase extends Entity 
+    {
+    
+            @Column(name = "DELETED")
+            private boolean deleted;
+
+    
+    
+            @Column(name = "ADDRESS_STRING")
+            private String addressString;
+
+    
+    
+            @Column(name = "LOCALITY")
+            private String locality;
+
+    
+    
+            @Column(name = "COUNTRY")
+            private String country;
+
+    
+    
+            @Column(name = "CITY")
+            private String city;
+
+    
+    
+            @Column(name = "STATE")
+            private String state;
+
+    
+    
+            @Column(name = "COUNTRY_CODE")
+            private String countryCode;
+
+    
+    
+            @Column(name = "POSTAL_CODE")
+            private String postalCode;
+
+    
+
+     
+         /**
+         * Gets the Deleted.
+         *
+         * return the Deleted
+         */
+         @Bindable
+         public boolean isDeleted()
+         {
+            return deleted;
+         }
+
+         /**
+         * Sets the Deleted.
+         *
+         * @param deleted the Deleted
+         */
+         public void setDeleted(boolean deleted)
+         {
+            this.deleted = deleted;
+            notifyPropertyChanged(BR.deleted);
+         }
+     
+     
+         /**
+         * Gets the AddressString.
+         *
+         * return the AddressString
+         */
+         @Bindable
+         public String getAddressString()
+         {
+            return addressString;
+         }
+
+         /**
+         * Sets the AddressString.
+         *
+         * @param addressString the AddressString
+         */
+         public void setAddressString(String addressString)
+         {
+            this.addressString = addressString;
+            notifyPropertyChanged(BR.addressString);
+         }
+     
+     
+         /**
+         * Gets the Locality.
+         *
+         * return the Locality
+         */
+         @Bindable
+         public String getLocality()
+         {
+            return locality;
+         }
+
+         /**
+         * Sets the Locality.
+         *
+         * @param locality the Locality
+         */
+         public void setLocality(String locality)
+         {
+            this.locality = locality;
+            notifyPropertyChanged(BR.locality);
+         }
+     
+     
+         /**
+         * Gets the Country.
+         *
+         * return the Country
+         */
+         @Bindable
+         public String getCountry()
+         {
+            return country;
+         }
+
+         /**
+         * Sets the Country.
+         *
+         * @param country the Country
+         */
+         public void setCountry(String country)
+         {
+            this.country = country;
+            notifyPropertyChanged(BR.country);
+         }
+     
+     
+         /**
+         * Gets the City.
+         *
+         * return the City
+         */
+         @Bindable
+         public String getCity()
+         {
+            return city;
+         }
+
+         /**
+         * Sets the City.
+         *
+         * @param city the City
+         */
+         public void setCity(String city)
+         {
+            this.city = city;
+            notifyPropertyChanged(BR.city);
+         }
+     
+     
+         /**
+         * Gets the State.
+         *
+         * return the State
+         */
+         @Bindable
+         public String getState()
+         {
+            return state;
+         }
+
+         /**
+         * Sets the State.
+         *
+         * @param state the State
+         */
+         public void setState(String state)
+         {
+            this.state = state;
+            notifyPropertyChanged(BR.state);
+         }
+     
+     
+         /**
+         * Gets the CountryCode.
+         *
+         * return the CountryCode
+         */
+         @Bindable
+         public String getCountryCode()
+         {
+            return countryCode;
+         }
+
+         /**
+         * Sets the CountryCode.
+         *
+         * @param countryCode the CountryCode
+         */
+         public void setCountryCode(String countryCode)
+         {
+            this.countryCode = countryCode;
+            notifyPropertyChanged(BR.countryCode);
+         }
+     
+     
+         /**
+         * Gets the PostalCode.
+         *
+         * return the PostalCode
+         */
+         @Bindable
+         public String getPostalCode()
+         {
+            return postalCode;
+         }
+
+         /**
+         * Sets the PostalCode.
+         *
+         * @param postalCode the PostalCode
+         */
+         public void setPostalCode(String postalCode)
+         {
+            this.postalCode = postalCode;
+            notifyPropertyChanged(BR.postalCode);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java
index ba33c8331..968082ce9 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "APPLICATION_DISPLAY_PANEL_VERSIONS", database = TangoDB.class, cachingEnabled = true)
+public class ApplicationDisplayPanelVersion extends ApplicationDisplayPanelVersionBase
+{
 
-    @Table(name = "APPLICATION_DISPLAY_PANEL_VERSIONS", database = TangoDB.class)
-    public class ApplicationDisplayPanelVersion extends Entity 
-    {
     
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersionBase.java
new file mode 100644
index 000000000..5540a43b9
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersionBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class ApplicationDisplayPanelVersionBase extends Entity 
+    {
+    
+            @Column(name = "VERSION")
+            private double version;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+
+     
+         /**
+         * Gets the Version.
+         *
+         * return the Version
+         */
+         @Bindable
+         public double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(double version)
+         {
+            this.version = version;
+            notifyPropertyChanged(BR.version);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java
index 79efb9112..26aa6192f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "APPLICATION_FIRMWARE_VERSIONS", database = TangoDB.class, cachingEnabled = true)
+public class ApplicationFirmwareVersion extends ApplicationFirmwareVersionBase
+{
 
-    @Table(name = "APPLICATION_FIRMWARE_VERSIONS", database = TangoDB.class)
-    public class ApplicationFirmwareVersion extends Entity 
-    {
     
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersionBase.java
new file mode 100644
index 000000000..b72c2824b
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersionBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class ApplicationFirmwareVersionBase extends Entity 
+    {
+    
+            @Column(name = "VERSION")
+            private double version;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+
+     
+         /**
+         * Gets the Version.
+         *
+         * return the Version
+         */
+         @Bindable
+         public double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(double version)
+         {
+            this.version = version;
+            notifyPropertyChanged(BR.version);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java
index 01205ca45..9bf8c1e08 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "APPLICATION_OS_VERSIONS", database = TangoDB.class, cachingEnabled = true)
+public class ApplicationOsVersion extends ApplicationOsVersionBase
+{
 
-    @Table(name = "APPLICATION_OS_VERSIONS", database = TangoDB.class)
-    public class ApplicationOsVersion extends Entity 
-    {
     
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersionBase.java
new file mode 100644
index 000000000..53cf9e864
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersionBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class ApplicationOsVersionBase extends Entity 
+    {
+    
+            @Column(name = "VERSION")
+            private double version;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+
+     
+         /**
+         * Gets the Version.
+         *
+         * return the Version
+         */
+         @Bindable
+         public double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(double version)
+         {
+            this.version = version;
+            notifyPropertyChanged(BR.version);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java
index 55a393a8b..b57c511c9 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "APPLICATION_VERSIONS", database = TangoDB.class, cachingEnabled = true)
+public class ApplicationVersion extends ApplicationVersionBase
+{
 
-    @Table(name = "APPLICATION_VERSIONS", database = TangoDB.class)
-    public class ApplicationVersion extends Entity 
-    {
     
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersionBase.java
new file mode 100644
index 000000000..f3ae3b9a2
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersionBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class ApplicationVersionBase extends Entity 
+    {
+    
+            @Column(name = "VERSION")
+            private double version;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+
+     
+         /**
+         * Gets the Version.
+         *
+         * return the Version
+         */
+         @Bindable
+         public double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(double version)
+         {
+            this.version = version;
+            notifyPropertyChanged(BR.version);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java
index c94c7b884..ed861bf0f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStop.java
@@ -1,690 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "BRUSH_STOPS", database = TangoDB.class, cachingEnabled = true)
+public class BrushStop extends BrushStopBase
+{
 
-    @Table(name = "BRUSH_STOPS", database = TangoDB.class)
-    public class BrushStop extends Entity 
-    {
     
-            @Column(name = "OFFSET_PERCENT")
-            private double offsetPercent;
-
-    
-    
-            @Column(name = "STOP_INDEX")
-            private int stopIndex;
-
-    
-    
-            @Column(name = "CYAN")
-            private double cyan;
-
-    
-    
-            @Column(name = "MAGENTA")
-            private double magenta;
-
-    
-    
-            @Column(name = "YELLOW")
-            private double yellow;
-
-    
-    
-            @Column(name = "BLACK")
-            private double black;
-
-    
-    
-            @Column(name = "RED")
-            private int red;
-
-    
-    
-            @Column(name = "GREEN")
-            private int green;
-
-    
-    
-            @Column(name = "BLUE")
-            private int blue;
-
-    
-    
-            @Column(name = "L")
-            private double l;
-
-    
-    
-            @Column(name = "A")
-            private double a;
-
-    
-    
-            @Column(name = "B")
-            private double b;
-
-    
-    
-            @Column(name = "V0")
-            private double v0;
-
-    
-    
-            @Column(name = "V1")
-            private double v1;
-
-    
-    
-            @Column(name = "V2")
-            private double v2;
-
-    
-    
-            @Column(name = "V3")
-            private double v3;
-
-    
-    
-            @Column(name = "V4")
-            private double v4;
-
-    
-    
-            @Column(name = "V5")
-            private double v5;
-
-    
-    
-            @Column(name = "V6")
-            private double v6;
-
-    
-    
-            @Column(name = "V7")
-            private double v7;
-
-    
-    
-            @Column(name = "COLOR_CATALOG_CODE")
-            private int colorCatalogCode;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "COLOR_CATALOGS_GUID", foreignKeyColumnName = "GUID")})
-            private ColorCatalog colorCatalogs;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "COLOR_SPACES_GUID", foreignKeyColumnName = "GUID")})
-            private ColorSpace colorSpaces;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "SEGMENT_GUID", foreignKeyColumnName = "GUID")})
-            private Segment segment;
-
-    
-
-     
-         /**
-         * Gets the OffsetPercent.
-         *
-         * return the OffsetPercent
-         */
-         @Bindable
-         public double getOffsetPercent()
-         {
-            return offsetPercent;
-         }
-
-         /**
-         * Sets the OffsetPercent.
-         *
-         * @param offsetPercent the OffsetPercent
-         */
-         public void setOffsetPercent(double offsetPercent)
-         {
-            this.offsetPercent = offsetPercent;
-            notifyPropertyChanged(BR.offsetPercent);
-         }
-     
-     
-         /**
-         * Gets the StopIndex.
-         *
-         * return the StopIndex
-         */
-         @Bindable
-         public int getStopIndex()
-         {
-            return stopIndex;
-         }
-
-         /**
-         * Sets the StopIndex.
-         *
-         * @param stopIndex the StopIndex
-         */
-         public void setStopIndex(int stopIndex)
-         {
-            this.stopIndex = stopIndex;
-            notifyPropertyChanged(BR.stopIndex);
-         }
-     
-     
-         /**
-         * Gets the Cyan.
-         *
-         * return the Cyan
-         */
-         @Bindable
-         public double getCyan()
-         {
-            return cyan;
-         }
-
-         /**
-         * Sets the Cyan.
-         *
-         * @param cyan the Cyan
-         */
-         public void setCyan(double cyan)
-         {
-            this.cyan = cyan;
-            notifyPropertyChanged(BR.cyan);
-         }
-     
-     
-         /**
-         * Gets the Magenta.
-         *
-         * return the Magenta
-         */
-         @Bindable
-         public double getMagenta()
-         {
-            return magenta;
-         }
-
-         /**
-         * Sets the Magenta.
-         *
-         * @param magenta the Magenta
-         */
-         public void setMagenta(double magenta)
-         {
-            this.magenta = magenta;
-            notifyPropertyChanged(BR.magenta);
-         }
-     
-     
-         /**
-         * Gets the Yellow.
-         *
-         * return the Yellow
-         */
-         @Bindable
-         public double getYellow()
-         {
-            return yellow;
-         }
-
-         /**
-         * Sets the Yellow.
-         *
-         * @param yellow the Yellow
-         */
-         public void setYellow(double yellow)
-         {
-            this.yellow = yellow;
-            notifyPropertyChanged(BR.yellow);
-         }
-     
-     
-         /**
-         * Gets the Black.
-         *
-         * return the Black
-         */
-         @Bindable
-         public double getBlack()
-         {
-            return black;
-         }
-
-         /**
-         * Sets the Black.
-         *
-         * @param black the Black
-         */
-         public void setBlack(double black)
-         {
-            this.black = black;
-            notifyPropertyChanged(BR.black);
-         }
-     
-     
-         /**
-         * Gets the Red.
-         *
-         * return the Red
-         */
-         @Bindable
-         public int getRed()
-         {
-            return red;
-         }
-
-         /**
-         * Sets the Red.
-         *
-         * @param red the Red
-         */
-         public void setRed(int red)
-         {
-            this.red = red;
-            notifyPropertyChanged(BR.red);
-         }
-     
-     
-         /**
-         * Gets the Green.
-         *
-         * return the Green
-         */
-         @Bindable
-         public int getGreen()
-         {
-            return green;
-         }
-
-         /**
-         * Sets the Green.
-         *
-         * @param green the Green
-         */
-         public void setGreen(int green)
-         {
-            this.green = green;
-            notifyPropertyChanged(BR.green);
-         }
-     
-     
-         /**
-         * Gets the Blue.
-         *
-         * return the Blue
-         */
-         @Bindable
-         public int getBlue()
-         {
-            return blue;
-         }
-
-         /**
-         * Sets the Blue.
-         *
-         * @param blue the Blue
-         */
-         public void setBlue(int blue)
-         {
-            this.blue = blue;
-            notifyPropertyChanged(BR.blue);
-         }
-     
-     
-         /**
-         * Gets the L.
-         *
-         * return the L
-         */
-         @Bindable
-         public double getL()
-         {
-            return l;
-         }
-
-         /**
-         * Sets the L.
-         *
-         * @param l the L
-         */
-         public void setL(double l)
-         {
-            this.l = l;
-            notifyPropertyChanged(BR.l);
-         }
-     
-     
-         /**
-         * Gets the A.
-         *
-         * return the A
-         */
-         @Bindable
-         public double getA()
-         {
-            return a;
-         }
-
-         /**
-         * Sets the A.
-         *
-         * @param a the A
-         */
-         public void setA(double a)
-         {
-            this.a = a;
-            notifyPropertyChanged(BR.a);
-         }
-     
-     
-         /**
-         * Gets the B.
-         *
-         * return the B
-         */
-         @Bindable
-         public double getB()
-         {
-            return b;
-         }
-
-         /**
-         * Sets the B.
-         *
-         * @param b the B
-         */
-         public void setB(double b)
-         {
-            this.b = b;
-            notifyPropertyChanged(BR.b);
-         }
-     
-     
-         /**
-         * Gets the V0.
-         *
-         * return the V0
-         */
-         @Bindable
-         public double getV0()
-         {
-            return v0;
-         }
-
-         /**
-         * Sets the V0.
-         *
-         * @param v0 the V0
-         */
-         public void setV0(double v0)
-         {
-            this.v0 = v0;
-            notifyPropertyChanged(BR.v0);
-         }
-     
-     
-         /**
-         * Gets the V1.
-         *
-         * return the V1
-         */
-         @Bindable
-         public double getV1()
-         {
-            return v1;
-         }
-
-         /**
-         * Sets the V1.
-         *
-         * @param v1 the V1
-         */
-         public void setV1(double v1)
-         {
-            this.v1 = v1;
-            notifyPropertyChanged(BR.v1);
-         }
-     
-     
-         /**
-         * Gets the V2.
-         *
-         * return the V2
-         */
-         @Bindable
-         public double getV2()
-         {
-            return v2;
-         }
-
-         /**
-         * Sets the V2.
-         *
-         * @param v2 the V2
-         */
-         public void setV2(double v2)
-         {
-            this.v2 = v2;
-            notifyPropertyChanged(BR.v2);
-         }
-     
-     
-         /**
-         * Gets the V3.
-         *
-         * return the V3
-         */
-         @Bindable
-         public double getV3()
-         {
-            return v3;
-         }
-
-         /**
-         * Sets the V3.
-         *
-         * @param v3 the V3
-         */
-         public void setV3(double v3)
-         {
-            this.v3 = v3;
-            notifyPropertyChanged(BR.v3);
-         }
-     
-     
-         /**
-         * Gets the V4.
-         *
-         * return the V4
-         */
-         @Bindable
-         public double getV4()
-         {
-            return v4;
-         }
-
-         /**
-         * Sets the V4.
-         *
-         * @param v4 the V4
-         */
-         public void setV4(double v4)
-         {
-            this.v4 = v4;
-            notifyPropertyChanged(BR.v4);
-         }
-     
-     
-         /**
-         * Gets the V5.
-         *
-         * return the V5
-         */
-         @Bindable
-         public double getV5()
-         {
-            return v5;
-         }
-
-         /**
-         * Sets the V5.
-         *
-         * @param v5 the V5
-         */
-         public void setV5(double v5)
-         {
-            this.v5 = v5;
-            notifyPropertyChanged(BR.v5);
-         }
-     
-     
-         /**
-         * Gets the V6.
-         *
-         * return the V6
-         */
-         @Bindable
-         public double getV6()
-         {
-            return v6;
-         }
-
-         /**
-         * Sets the V6.
-         *
-         * @param v6 the V6
-         */
-         public void setV6(double v6)
-         {
-            this.v6 = v6;
-            notifyPropertyChanged(BR.v6);
-         }
-     
-     
-         /**
-         * Gets the V7.
-         *
-         * return the V7
-         */
-         @Bindable
-         public double getV7()
-         {
-            return v7;
-         }
-
-         /**
-         * Sets the V7.
-         *
-         * @param v7 the V7
-         */
-         public void setV7(double v7)
-         {
-            this.v7 = v7;
-            notifyPropertyChanged(BR.v7);
-         }
-     
-     
-         /**
-         * Gets the ColorCatalogCode.
-         *
-         * return the ColorCatalogCode
-         */
-         @Bindable
-         public int getColorCatalogCode()
-         {
-            return colorCatalogCode;
-         }
-
-         /**
-         * Sets the ColorCatalogCode.
-         *
-         * @param colorCatalogCode the ColorCatalogCode
-         */
-         public void setColorCatalogCode(int colorCatalogCode)
-         {
-            this.colorCatalogCode = colorCatalogCode;
-            notifyPropertyChanged(BR.colorCatalogCode);
-         }
-     
-     
-         /**
-         * Gets the ColorCatalogs.
-         *
-         * return the ColorCatalogs
-         */
-         @Bindable
-         public ColorCatalog getColorCatalogs()
-         {
-            return colorCatalogs;
-         }
-
-         /**
-         * Sets the ColorCatalogs.
-         *
-         * @param colorCatalogs the ColorCatalogs
-         */
-         public void setColorCatalogs(ColorCatalog colorCatalogs)
-         {
-            this.colorCatalogs = colorCatalogs;
-            notifyPropertyChanged(BR.colorCatalogs);
-         }
-     
-     
-         /**
-         * Gets the ColorSpaces.
-         *
-         * return the ColorSpaces
-         */
-         @Bindable
-         public ColorSpace getColorSpaces()
-         {
-            return colorSpaces;
-         }
-
-         /**
-         * Sets the ColorSpaces.
-         *
-         * @param colorSpaces the ColorSpaces
-         */
-         public void setColorSpaces(ColorSpace colorSpaces)
-         {
-            this.colorSpaces = colorSpaces;
-            notifyPropertyChanged(BR.colorSpaces);
-         }
-     
-     
-         /**
-         * Gets the Segment.
-         *
-         * return the Segment
-         */
-         @Bindable
-         public Segment getSegment()
-         {
-            return segment;
-         }
-
-         /**
-         * Sets the Segment.
-         *
-         * @param segment the Segment
-         */
-         public void setSegment(Segment segment)
-         {
-            this.segment = segment;
-            notifyPropertyChanged(BR.segment);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStopBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStopBase.java
new file mode 100644
index 000000000..1e09a088e
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/BrushStopBase.java
@@ -0,0 +1,687 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class BrushStopBase extends Entity 
+    {
+    
+            @Column(name = "OFFSET_PERCENT")
+            private double offsetPercent;
+
+    
+    
+            @Column(name = "STOP_INDEX")
+            private int stopIndex;
+
+    
+    
+            @Column(name = "CYAN")
+            private double cyan;
+
+    
+    
+            @Column(name = "MAGENTA")
+            private double magenta;
+
+    
+    
+            @Column(name = "YELLOW")
+            private double yellow;
+
+    
+    
+            @Column(name = "BLACK")
+            private double black;
+
+    
+    
+            @Column(name = "RED")
+            private int red;
+
+    
+    
+            @Column(name = "GREEN")
+            private int green;
+
+    
+    
+            @Column(name = "BLUE")
+            private int blue;
+
+    
+    
+            @Column(name = "L")
+            private double l;
+
+    
+    
+            @Column(name = "A")
+            private double a;
+
+    
+    
+            @Column(name = "B")
+            private double b;
+
+    
+    
+            @Column(name = "V0")
+            private double v0;
+
+    
+    
+            @Column(name = "V1")
+            private double v1;
+
+    
+    
+            @Column(name = "V2")
+            private double v2;
+
+    
+    
+            @Column(name = "V3")
+            private double v3;
+
+    
+    
+            @Column(name = "V4")
+            private double v4;
+
+    
+    
+            @Column(name = "V5")
+            private double v5;
+
+    
+    
+            @Column(name = "V6")
+            private double v6;
+
+    
+    
+            @Column(name = "V7")
+            private double v7;
+
+    
+    
+            @Column(name = "COLOR_CATALOG_CODE")
+            private int colorCatalogCode;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "COLOR_CATALOG_GUID", foreignKeyColumnName = "GUID")})
+            private ColorCatalog colorCatalog;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "COLOR_SPACE_GUID", foreignKeyColumnName = "GUID")})
+            private ColorSpace colorSpace;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "SEGMENT_GUID", foreignKeyColumnName = "GUID")})
+            private Segment segment;
+
+    
+
+     
+         /**
+         * Gets the OffsetPercent.
+         *
+         * return the OffsetPercent
+         */
+         @Bindable
+         public double getOffsetPercent()
+         {
+            return offsetPercent;
+         }
+
+         /**
+         * Sets the OffsetPercent.
+         *
+         * @param offsetPercent the OffsetPercent
+         */
+         public void setOffsetPercent(double offsetPercent)
+         {
+            this.offsetPercent = offsetPercent;
+            notifyPropertyChanged(BR.offsetPercent);
+         }
+     
+     
+         /**
+         * Gets the StopIndex.
+         *
+         * return the StopIndex
+         */
+         @Bindable
+         public int getStopIndex()
+         {
+            return stopIndex;
+         }
+
+         /**
+         * Sets the StopIndex.
+         *
+         * @param stopIndex the StopIndex
+         */
+         public void setStopIndex(int stopIndex)
+         {
+            this.stopIndex = stopIndex;
+            notifyPropertyChanged(BR.stopIndex);
+         }
+     
+     
+         /**
+         * Gets the Cyan.
+         *
+         * return the Cyan
+         */
+         @Bindable
+         public double getCyan()
+         {
+            return cyan;
+         }
+
+         /**
+         * Sets the Cyan.
+         *
+         * @param cyan the Cyan
+         */
+         public void setCyan(double cyan)
+         {
+            this.cyan = cyan;
+            notifyPropertyChanged(BR.cyan);
+         }
+     
+     
+         /**
+         * Gets the Magenta.
+         *
+         * return the Magenta
+         */
+         @Bindable
+         public double getMagenta()
+         {
+            return magenta;
+         }
+
+         /**
+         * Sets the Magenta.
+         *
+         * @param magenta the Magenta
+         */
+         public void setMagenta(double magenta)
+         {
+            this.magenta = magenta;
+            notifyPropertyChanged(BR.magenta);
+         }
+     
+     
+         /**
+         * Gets the Yellow.
+         *
+         * return the Yellow
+         */
+         @Bindable
+         public double getYellow()
+         {
+            return yellow;
+         }
+
+         /**
+         * Sets the Yellow.
+         *
+         * @param yellow the Yellow
+         */
+         public void setYellow(double yellow)
+         {
+            this.yellow = yellow;
+            notifyPropertyChanged(BR.yellow);
+         }
+     
+     
+         /**
+         * Gets the Black.
+         *
+         * return the Black
+         */
+         @Bindable
+         public double getBlack()
+         {
+            return black;
+         }
+
+         /**
+         * Sets the Black.
+         *
+         * @param black the Black
+         */
+         public void setBlack(double black)
+         {
+            this.black = black;
+            notifyPropertyChanged(BR.black);
+         }
+     
+     
+         /**
+         * Gets the Red.
+         *
+         * return the Red
+         */
+         @Bindable
+         public int getRed()
+         {
+            return red;
+         }
+
+         /**
+         * Sets the Red.
+         *
+         * @param red the Red
+         */
+         public void setRed(int red)
+         {
+            this.red = red;
+            notifyPropertyChanged(BR.red);
+         }
+     
+     
+         /**
+         * Gets the Green.
+         *
+         * return the Green
+         */
+         @Bindable
+         public int getGreen()
+         {
+            return green;
+         }
+
+         /**
+         * Sets the Green.
+         *
+         * @param green the Green
+         */
+         public void setGreen(int green)
+         {
+            this.green = green;
+            notifyPropertyChanged(BR.green);
+         }
+     
+     
+         /**
+         * Gets the Blue.
+         *
+         * return the Blue
+         */
+         @Bindable
+         public int getBlue()
+         {
+            return blue;
+         }
+
+         /**
+         * Sets the Blue.
+         *
+         * @param blue the Blue
+         */
+         public void setBlue(int blue)
+         {
+            this.blue = blue;
+            notifyPropertyChanged(BR.blue);
+         }
+     
+     
+         /**
+         * Gets the L.
+         *
+         * return the L
+         */
+         @Bindable
+         public double getL()
+         {
+            return l;
+         }
+
+         /**
+         * Sets the L.
+         *
+         * @param l the L
+         */
+         public void setL(double l)
+         {
+            this.l = l;
+            notifyPropertyChanged(BR.l);
+         }
+     
+     
+         /**
+         * Gets the A.
+         *
+         * return the A
+         */
+         @Bindable
+         public double getA()
+         {
+            return a;
+         }
+
+         /**
+         * Sets the A.
+         *
+         * @param a the A
+         */
+         public void setA(double a)
+         {
+            this.a = a;
+            notifyPropertyChanged(BR.a);
+         }
+     
+     
+         /**
+         * Gets the B.
+         *
+         * return the B
+         */
+         @Bindable
+         public double getB()
+         {
+            return b;
+         }
+
+         /**
+         * Sets the B.
+         *
+         * @param b the B
+         */
+         public void setB(double b)
+         {
+            this.b = b;
+            notifyPropertyChanged(BR.b);
+         }
+     
+     
+         /**
+         * Gets the V0.
+         *
+         * return the V0
+         */
+         @Bindable
+         public double getV0()
+         {
+            return v0;
+         }
+
+         /**
+         * Sets the V0.
+         *
+         * @param v0 the V0
+         */
+         public void setV0(double v0)
+         {
+            this.v0 = v0;
+            notifyPropertyChanged(BR.v0);
+         }
+     
+     
+         /**
+         * Gets the V1.
+         *
+         * return the V1
+         */
+         @Bindable
+         public double getV1()
+         {
+            return v1;
+         }
+
+         /**
+         * Sets the V1.
+         *
+         * @param v1 the V1
+         */
+         public void setV1(double v1)
+         {
+            this.v1 = v1;
+            notifyPropertyChanged(BR.v1);
+         }
+     
+     
+         /**
+         * Gets the V2.
+         *
+         * return the V2
+         */
+         @Bindable
+         public double getV2()
+         {
+            return v2;
+         }
+
+         /**
+         * Sets the V2.
+         *
+         * @param v2 the V2
+         */
+         public void setV2(double v2)
+         {
+            this.v2 = v2;
+            notifyPropertyChanged(BR.v2);
+         }
+     
+     
+         /**
+         * Gets the V3.
+         *
+         * return the V3
+         */
+         @Bindable
+         public double getV3()
+         {
+            return v3;
+         }
+
+         /**
+         * Sets the V3.
+         *
+         * @param v3 the V3
+         */
+         public void setV3(double v3)
+         {
+            this.v3 = v3;
+            notifyPropertyChanged(BR.v3);
+         }
+     
+     
+         /**
+         * Gets the V4.
+         *
+         * return the V4
+         */
+         @Bindable
+         public double getV4()
+         {
+            return v4;
+         }
+
+         /**
+         * Sets the V4.
+         *
+         * @param v4 the V4
+         */
+         public void setV4(double v4)
+         {
+            this.v4 = v4;
+            notifyPropertyChanged(BR.v4);
+         }
+     
+     
+         /**
+         * Gets the V5.
+         *
+         * return the V5
+         */
+         @Bindable
+         public double getV5()
+         {
+            return v5;
+         }
+
+         /**
+         * Sets the V5.
+         *
+         * @param v5 the V5
+         */
+         public void setV5(double v5)
+         {
+            this.v5 = v5;
+            notifyPropertyChanged(BR.v5);
+         }
+     
+     
+         /**
+         * Gets the V6.
+         *
+         * return the V6
+         */
+         @Bindable
+         public double getV6()
+         {
+            return v6;
+         }
+
+         /**
+         * Sets the V6.
+         *
+         * @param v6 the V6
+         */
+         public void setV6(double v6)
+         {
+            this.v6 = v6;
+            notifyPropertyChanged(BR.v6);
+         }
+     
+     
+         /**
+         * Gets the V7.
+         *
+         * return the V7
+         */
+         @Bindable
+         public double getV7()
+         {
+            return v7;
+         }
+
+         /**
+         * Sets the V7.
+         *
+         * @param v7 the V7
+         */
+         public void setV7(double v7)
+         {
+            this.v7 = v7;
+            notifyPropertyChanged(BR.v7);
+         }
+     
+     
+         /**
+         * Gets the ColorCatalogCode.
+         *
+         * return the ColorCatalogCode
+         */
+         @Bindable
+         public int getColorCatalogCode()
+         {
+            return colorCatalogCode;
+         }
+
+         /**
+         * Sets the ColorCatalogCode.
+         *
+         * @param colorCatalogCode the ColorCatalogCode
+         */
+         public void setColorCatalogCode(int colorCatalogCode)
+         {
+            this.colorCatalogCode = colorCatalogCode;
+            notifyPropertyChanged(BR.colorCatalogCode);
+         }
+     
+     
+         /**
+         * Gets the ColorCatalog.
+         *
+         * return the ColorCatalog
+         */
+         @Bindable
+         public ColorCatalog getColorCatalog()
+         {
+            return colorCatalog;
+         }
+
+         /**
+         * Sets the ColorCatalog.
+         *
+         * @param colorCatalog the ColorCatalog
+         */
+         public void setColorCatalog(ColorCatalog colorCatalog)
+         {
+            this.colorCatalog = colorCatalog;
+            notifyPropertyChanged(BR.colorCatalog);
+         }
+     
+     
+         /**
+         * Gets the ColorSpace.
+         *
+         * return the ColorSpace
+         */
+         @Bindable
+         public ColorSpace getColorSpace()
+         {
+            return colorSpace;
+         }
+
+         /**
+         * Sets the ColorSpace.
+         *
+         * @param colorSpace the ColorSpace
+         */
+         public void setColorSpace(ColorSpace colorSpace)
+         {
+            this.colorSpace = colorSpace;
+            notifyPropertyChanged(BR.colorSpace);
+         }
+     
+     
+         /**
+         * Gets the Segment.
+         *
+         * return the Segment
+         */
+         @Bindable
+         public Segment getSegment()
+         {
+            return segment;
+         }
+
+         /**
+         * Sets the Segment.
+         *
+         * @param segment the Segment
+         */
+         public void setSegment(Segment segment)
+         {
+            this.segment = segment;
+            notifyPropertyChanged(BR.segment);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java
index 891085433..b25fc4e51 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "CARTRIDGE_TYPES", database = TangoDB.class, cachingEnabled = true)
+public class CartridgeType extends CartridgeTypeBase
+{
 
-    @Table(name = "CARTRIDGE_TYPES", database = TangoDB.class)
-    public class CartridgeType extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeTypeBase.java
new file mode 100644
index 000000000..53ed798c1
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeTypeBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class CartridgeTypeBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java
index 878bb3139..78a78022c 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cat.java
@@ -1,158 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "CATS", database = TangoDB.class, cachingEnabled = true)
+public class Cat extends CatBase
+{
 
-    @Table(name = "CATS", database = TangoDB.class)
-    public class Cat extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DATA")
-            private byte[] data;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private LiquidType liquidTypes;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
-            private Machine machine;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
-            private Rml rml;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Data.
-         *
-         * return the Data
-         */
-         @Bindable
-         public byte[] getData()
-         {
-            return data;
-         }
-
-         /**
-         * Sets the Data.
-         *
-         * @param data the Data
-         */
-         public void setData(byte[] data)
-         {
-            this.data = data;
-            notifyPropertyChanged(BR.data);
-         }
-     
-     
-         /**
-         * Gets the LiquidTypes.
-         *
-         * return the LiquidTypes
-         */
-         @Bindable
-         public LiquidType getLiquidTypes()
-         {
-            return liquidTypes;
-         }
-
-         /**
-         * Sets the LiquidTypes.
-         *
-         * @param liquidTypes the LiquidTypes
-         */
-         public void setLiquidTypes(LiquidType liquidTypes)
-         {
-            this.liquidTypes = liquidTypes;
-            notifyPropertyChanged(BR.liquidTypes);
-         }
-     
-     
-         /**
-         * Gets the Machine.
-         *
-         * return the Machine
-         */
-         @Bindable
-         public Machine getMachine()
-         {
-            return machine;
-         }
-
-         /**
-         * Sets the Machine.
-         *
-         * @param machine the Machine
-         */
-         public void setMachine(Machine machine)
-         {
-            this.machine = machine;
-            notifyPropertyChanged(BR.machine);
-         }
-     
-     
-         /**
-         * Gets the Rml.
-         *
-         * return the Rml
-         */
-         @Bindable
-         public Rml getRml()
-         {
-            return rml;
-         }
-
-         /**
-         * Sets the Rml.
-         *
-         * @param rml the Rml
-         */
-         public void setRml(Rml rml)
-         {
-            this.rml = rml;
-            notifyPropertyChanged(BR.rml);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CatBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CatBase.java
new file mode 100644
index 000000000..8d7c0ae3d
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CatBase.java
@@ -0,0 +1,155 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class CatBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DATA")
+            private byte[] data;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private LiquidType liquidType;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
+            private Machine machine;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
+            private Rml rml;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Data.
+         *
+         * return the Data
+         */
+         @Bindable
+         public byte[] getData()
+         {
+            return data;
+         }
+
+         /**
+         * Sets the Data.
+         *
+         * @param data the Data
+         */
+         public void setData(byte[] data)
+         {
+            this.data = data;
+            notifyPropertyChanged(BR.data);
+         }
+     
+     
+         /**
+         * Gets the LiquidType.
+         *
+         * return the LiquidType
+         */
+         @Bindable
+         public LiquidType getLiquidType()
+         {
+            return liquidType;
+         }
+
+         /**
+         * Sets the LiquidType.
+         *
+         * @param liquidType the LiquidType
+         */
+         public void setLiquidType(LiquidType liquidType)
+         {
+            this.liquidType = liquidType;
+            notifyPropertyChanged(BR.liquidType);
+         }
+     
+     
+         /**
+         * Gets the Machine.
+         *
+         * return the Machine
+         */
+         @Bindable
+         public Machine getMachine()
+         {
+            return machine;
+         }
+
+         /**
+         * Sets the Machine.
+         *
+         * @param machine the Machine
+         */
+         public void setMachine(Machine machine)
+         {
+            this.machine = machine;
+            notifyPropertyChanged(BR.machine);
+         }
+     
+     
+         /**
+         * Gets the Rml.
+         *
+         * return the Rml
+         */
+         @Bindable
+         public Rml getRml()
+         {
+            return rml;
+         }
+
+         /**
+         * Sets the Rml.
+         *
+         * @param rml the Rml
+         */
+         public void setRml(Rml rml)
+         {
+            this.rml = rml;
+            notifyPropertyChanged(BR.rml);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java
index 8d82c0fb6..f3a94048a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cct.java
@@ -1,242 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "CCTS", database = TangoDB.class, cachingEnabled = true)
+public class Cct extends CctBase
+{
 
-    @Table(name = "CCTS", database = TangoDB.class)
-    public class Cct extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "FORWARD_FILE_NAME")
-            private String forwardFileName;
-
-    
-    
-            @Column(name = "INVERSE_FILE_NAME")
-            private String inverseFileName;
-
-    
-    
-            @Column(name = "FORWARD_DATA")
-            private byte[] forwardData;
-
-    
-    
-            @Column(name = "INVERSE_DATA")
-            private byte[] inverseData;
-
-    
-    
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
-            private Rml rml;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the ForwardFileName.
-         *
-         * return the ForwardFileName
-         */
-         @Bindable
-         public String getForwardFileName()
-         {
-            return forwardFileName;
-         }
-
-         /**
-         * Sets the ForwardFileName.
-         *
-         * @param forwardFileName the ForwardFileName
-         */
-         public void setForwardFileName(String forwardFileName)
-         {
-            this.forwardFileName = forwardFileName;
-            notifyPropertyChanged(BR.forwardFileName);
-         }
-     
-     
-         /**
-         * Gets the InverseFileName.
-         *
-         * return the InverseFileName
-         */
-         @Bindable
-         public String getInverseFileName()
-         {
-            return inverseFileName;
-         }
-
-         /**
-         * Sets the InverseFileName.
-         *
-         * @param inverseFileName the InverseFileName
-         */
-         public void setInverseFileName(String inverseFileName)
-         {
-            this.inverseFileName = inverseFileName;
-            notifyPropertyChanged(BR.inverseFileName);
-         }
-     
-     
-         /**
-         * Gets the ForwardData.
-         *
-         * return the ForwardData
-         */
-         @Bindable
-         public byte[] getForwardData()
-         {
-            return forwardData;
-         }
-
-         /**
-         * Sets the ForwardData.
-         *
-         * @param forwardData the ForwardData
-         */
-         public void setForwardData(byte[] forwardData)
-         {
-            this.forwardData = forwardData;
-            notifyPropertyChanged(BR.forwardData);
-         }
-     
-     
-         /**
-         * Gets the InverseData.
-         *
-         * return the InverseData
-         */
-         @Bindable
-         public byte[] getInverseData()
-         {
-            return inverseData;
-         }
-
-         /**
-         * Sets the InverseData.
-         *
-         * @param inverseData the InverseData
-         */
-         public void setInverseData(byte[] inverseData)
-         {
-            this.inverseData = inverseData;
-            notifyPropertyChanged(BR.inverseData);
-         }
-     
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Rml.
-         *
-         * return the Rml
-         */
-         @Bindable
-         public Rml getRml()
-         {
-            return rml;
-         }
-
-         /**
-         * Sets the Rml.
-         *
-         * @param rml the Rml
-         */
-         public void setRml(Rml rml)
-         {
-            this.rml = rml;
-            notifyPropertyChanged(BR.rml);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CctBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CctBase.java
new file mode 100644
index 000000000..10d07e209
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CctBase.java
@@ -0,0 +1,239 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class CctBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+    
+            @Column(name = "FORWARD_FILE_NAME")
+            private String forwardFileName;
+
+    
+    
+            @Column(name = "INVERSE_FILE_NAME")
+            private String inverseFileName;
+
+    
+    
+            @Column(name = "FORWARD_DATA")
+            private byte[] forwardData;
+
+    
+    
+            @Column(name = "INVERSE_DATA")
+            private byte[] inverseData;
+
+    
+    
+            @Column(name = "VERSION")
+            private double version;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
+            private Rml rml;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+     
+         /**
+         * Gets the ForwardFileName.
+         *
+         * return the ForwardFileName
+         */
+         @Bindable
+         public String getForwardFileName()
+         {
+            return forwardFileName;
+         }
+
+         /**
+         * Sets the ForwardFileName.
+         *
+         * @param forwardFileName the ForwardFileName
+         */
+         public void setForwardFileName(String forwardFileName)
+         {
+            this.forwardFileName = forwardFileName;
+            notifyPropertyChanged(BR.forwardFileName);
+         }
+     
+     
+         /**
+         * Gets the InverseFileName.
+         *
+         * return the InverseFileName
+         */
+         @Bindable
+         public String getInverseFileName()
+         {
+            return inverseFileName;
+         }
+
+         /**
+         * Sets the InverseFileName.
+         *
+         * @param inverseFileName the InverseFileName
+         */
+         public void setInverseFileName(String inverseFileName)
+         {
+            this.inverseFileName = inverseFileName;
+            notifyPropertyChanged(BR.inverseFileName);
+         }
+     
+     
+         /**
+         * Gets the ForwardData.
+         *
+         * return the ForwardData
+         */
+         @Bindable
+         public byte[] getForwardData()
+         {
+            return forwardData;
+         }
+
+         /**
+         * Sets the ForwardData.
+         *
+         * @param forwardData the ForwardData
+         */
+         public void setForwardData(byte[] forwardData)
+         {
+            this.forwardData = forwardData;
+            notifyPropertyChanged(BR.forwardData);
+         }
+     
+     
+         /**
+         * Gets the InverseData.
+         *
+         * return the InverseData
+         */
+         @Bindable
+         public byte[] getInverseData()
+         {
+            return inverseData;
+         }
+
+         /**
+         * Sets the InverseData.
+         *
+         * @param inverseData the InverseData
+         */
+         public void setInverseData(byte[] inverseData)
+         {
+            this.inverseData = inverseData;
+            notifyPropertyChanged(BR.inverseData);
+         }
+     
+     
+         /**
+         * Gets the Version.
+         *
+         * return the Version
+         */
+         @Bindable
+         public double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(double version)
+         {
+            this.version = version;
+            notifyPropertyChanged(BR.version);
+         }
+     
+     
+         /**
+         * Gets the Rml.
+         *
+         * return the Rml
+         */
+         @Bindable
+         public Rml getRml()
+         {
+            return rml;
+         }
+
+         /**
+         * Sets the Rml.
+         *
+         * @param rml the Rml
+         */
+         public void setRml(Rml rml)
+         {
+            this.rml = rml;
+            notifyPropertyChanged(BR.rml);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java
index 9466f5576..58efc626d 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalog.java
@@ -1,606 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "COLOR_CATALOGS", database = TangoDB.class, cachingEnabled = true)
+public class ColorCatalog extends ColorCatalogBase
+{
 
-    @Table(name = "COLOR_CATALOGS", database = TangoDB.class)
-    public class ColorCatalog extends Entity 
-    {
     
-            @Column(name = "COLOR_CODE")
-            private int colorCode;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CYAN")
-            private double cyan;
-
-    
-    
-            @Column(name = "MAGENTA")
-            private double magenta;
-
-    
-    
-            @Column(name = "YELLOW")
-            private double yellow;
-
-    
-    
-            @Column(name = "BLACK")
-            private double black;
-
-    
-    
-            @Column(name = "RED")
-            private int red;
-
-    
-    
-            @Column(name = "GREEN")
-            private int green;
-
-    
-    
-            @Column(name = "BLUE")
-            private int blue;
-
-    
-    
-            @Column(name = "L")
-            private double l;
-
-    
-    
-            @Column(name = "A")
-            private double a;
-
-    
-    
-            @Column(name = "B")
-            private double b;
-
-    
-    
-            @Column(name = "V0")
-            private double v0;
-
-    
-    
-            @Column(name = "V1")
-            private double v1;
-
-    
-    
-            @Column(name = "V2")
-            private double v2;
-
-    
-    
-            @Column(name = "V3")
-            private double v3;
-
-    
-    
-            @Column(name = "V4")
-            private double v4;
-
-    
-    
-            @Column(name = "V5")
-            private double v5;
-
-    
-    
-            @Column(name = "V6")
-            private double v6;
-
-    
-    
-            @Column(name = "V7")
-            private double v7;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "COLOR_SPACES_GUID", foreignKeyColumnName = "GUID")})
-            private ColorSpace colorSpaces;
-
-    
-
-     
-         /**
-         * Gets the ColorCode.
-         *
-         * return the ColorCode
-         */
-         @Bindable
-         public int getColorCode()
-         {
-            return colorCode;
-         }
-
-         /**
-         * Sets the ColorCode.
-         *
-         * @param colorCode the ColorCode
-         */
-         public void setColorCode(int colorCode)
-         {
-            this.colorCode = colorCode;
-            notifyPropertyChanged(BR.colorCode);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Cyan.
-         *
-         * return the Cyan
-         */
-         @Bindable
-         public double getCyan()
-         {
-            return cyan;
-         }
-
-         /**
-         * Sets the Cyan.
-         *
-         * @param cyan the Cyan
-         */
-         public void setCyan(double cyan)
-         {
-            this.cyan = cyan;
-            notifyPropertyChanged(BR.cyan);
-         }
-     
-     
-         /**
-         * Gets the Magenta.
-         *
-         * return the Magenta
-         */
-         @Bindable
-         public double getMagenta()
-         {
-            return magenta;
-         }
-
-         /**
-         * Sets the Magenta.
-         *
-         * @param magenta the Magenta
-         */
-         public void setMagenta(double magenta)
-         {
-            this.magenta = magenta;
-            notifyPropertyChanged(BR.magenta);
-         }
-     
-     
-         /**
-         * Gets the Yellow.
-         *
-         * return the Yellow
-         */
-         @Bindable
-         public double getYellow()
-         {
-            return yellow;
-         }
-
-         /**
-         * Sets the Yellow.
-         *
-         * @param yellow the Yellow
-         */
-         public void setYellow(double yellow)
-         {
-            this.yellow = yellow;
-            notifyPropertyChanged(BR.yellow);
-         }
-     
-     
-         /**
-         * Gets the Black.
-         *
-         * return the Black
-         */
-         @Bindable
-         public double getBlack()
-         {
-            return black;
-         }
-
-         /**
-         * Sets the Black.
-         *
-         * @param black the Black
-         */
-         public void setBlack(double black)
-         {
-            this.black = black;
-            notifyPropertyChanged(BR.black);
-         }
-     
-     
-         /**
-         * Gets the Red.
-         *
-         * return the Red
-         */
-         @Bindable
-         public int getRed()
-         {
-            return red;
-         }
-
-         /**
-         * Sets the Red.
-         *
-         * @param red the Red
-         */
-         public void setRed(int red)
-         {
-            this.red = red;
-            notifyPropertyChanged(BR.red);
-         }
-     
-     
-         /**
-         * Gets the Green.
-         *
-         * return the Green
-         */
-         @Bindable
-         public int getGreen()
-         {
-            return green;
-         }
-
-         /**
-         * Sets the Green.
-         *
-         * @param green the Green
-         */
-         public void setGreen(int green)
-         {
-            this.green = green;
-            notifyPropertyChanged(BR.green);
-         }
-     
-     
-         /**
-         * Gets the Blue.
-         *
-         * return the Blue
-         */
-         @Bindable
-         public int getBlue()
-         {
-            return blue;
-         }
-
-         /**
-         * Sets the Blue.
-         *
-         * @param blue the Blue
-         */
-         public void setBlue(int blue)
-         {
-            this.blue = blue;
-            notifyPropertyChanged(BR.blue);
-         }
-     
-     
-         /**
-         * Gets the L.
-         *
-         * return the L
-         */
-         @Bindable
-         public double getL()
-         {
-            return l;
-         }
-
-         /**
-         * Sets the L.
-         *
-         * @param l the L
-         */
-         public void setL(double l)
-         {
-            this.l = l;
-            notifyPropertyChanged(BR.l);
-         }
-     
-     
-         /**
-         * Gets the A.
-         *
-         * return the A
-         */
-         @Bindable
-         public double getA()
-         {
-            return a;
-         }
-
-         /**
-         * Sets the A.
-         *
-         * @param a the A
-         */
-         public void setA(double a)
-         {
-            this.a = a;
-            notifyPropertyChanged(BR.a);
-         }
-     
-     
-         /**
-         * Gets the B.
-         *
-         * return the B
-         */
-         @Bindable
-         public double getB()
-         {
-            return b;
-         }
-
-         /**
-         * Sets the B.
-         *
-         * @param b the B
-         */
-         public void setB(double b)
-         {
-            this.b = b;
-            notifyPropertyChanged(BR.b);
-         }
-     
-     
-         /**
-         * Gets the V0.
-         *
-         * return the V0
-         */
-         @Bindable
-         public double getV0()
-         {
-            return v0;
-         }
-
-         /**
-         * Sets the V0.
-         *
-         * @param v0 the V0
-         */
-         public void setV0(double v0)
-         {
-            this.v0 = v0;
-            notifyPropertyChanged(BR.v0);
-         }
-     
-     
-         /**
-         * Gets the V1.
-         *
-         * return the V1
-         */
-         @Bindable
-         public double getV1()
-         {
-            return v1;
-         }
-
-         /**
-         * Sets the V1.
-         *
-         * @param v1 the V1
-         */
-         public void setV1(double v1)
-         {
-            this.v1 = v1;
-            notifyPropertyChanged(BR.v1);
-         }
-     
-     
-         /**
-         * Gets the V2.
-         *
-         * return the V2
-         */
-         @Bindable
-         public double getV2()
-         {
-            return v2;
-         }
-
-         /**
-         * Sets the V2.
-         *
-         * @param v2 the V2
-         */
-         public void setV2(double v2)
-         {
-            this.v2 = v2;
-            notifyPropertyChanged(BR.v2);
-         }
-     
-     
-         /**
-         * Gets the V3.
-         *
-         * return the V3
-         */
-         @Bindable
-         public double getV3()
-         {
-            return v3;
-         }
-
-         /**
-         * Sets the V3.
-         *
-         * @param v3 the V3
-         */
-         public void setV3(double v3)
-         {
-            this.v3 = v3;
-            notifyPropertyChanged(BR.v3);
-         }
-     
-     
-         /**
-         * Gets the V4.
-         *
-         * return the V4
-         */
-         @Bindable
-         public double getV4()
-         {
-            return v4;
-         }
-
-         /**
-         * Sets the V4.
-         *
-         * @param v4 the V4
-         */
-         public void setV4(double v4)
-         {
-            this.v4 = v4;
-            notifyPropertyChanged(BR.v4);
-         }
-     
-     
-         /**
-         * Gets the V5.
-         *
-         * return the V5
-         */
-         @Bindable
-         public double getV5()
-         {
-            return v5;
-         }
-
-         /**
-         * Sets the V5.
-         *
-         * @param v5 the V5
-         */
-         public void setV5(double v5)
-         {
-            this.v5 = v5;
-            notifyPropertyChanged(BR.v5);
-         }
-     
-     
-         /**
-         * Gets the V6.
-         *
-         * return the V6
-         */
-         @Bindable
-         public double getV6()
-         {
-            return v6;
-         }
-
-         /**
-         * Sets the V6.
-         *
-         * @param v6 the V6
-         */
-         public void setV6(double v6)
-         {
-            this.v6 = v6;
-            notifyPropertyChanged(BR.v6);
-         }
-     
-     
-         /**
-         * Gets the V7.
-         *
-         * return the V7
-         */
-         @Bindable
-         public double getV7()
-         {
-            return v7;
-         }
-
-         /**
-         * Sets the V7.
-         *
-         * @param v7 the V7
-         */
-         public void setV7(double v7)
-         {
-            this.v7 = v7;
-            notifyPropertyChanged(BR.v7);
-         }
-     
-     
-         /**
-         * Gets the ColorSpaces.
-         *
-         * return the ColorSpaces
-         */
-         @Bindable
-         public ColorSpace getColorSpaces()
-         {
-            return colorSpaces;
-         }
-
-         /**
-         * Sets the ColorSpaces.
-         *
-         * @param colorSpaces the ColorSpaces
-         */
-         public void setColorSpaces(ColorSpace colorSpaces)
-         {
-            this.colorSpaces = colorSpaces;
-            notifyPropertyChanged(BR.colorSpaces);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalogBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalogBase.java
new file mode 100644
index 000000000..6fcbd8285
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorCatalogBase.java
@@ -0,0 +1,603 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class ColorCatalogBase extends Entity 
+    {
+    
+            @Column(name = "COLOR_CODE")
+            private int colorCode;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "CYAN")
+            private double cyan;
+
+    
+    
+            @Column(name = "MAGENTA")
+            private double magenta;
+
+    
+    
+            @Column(name = "YELLOW")
+            private double yellow;
+
+    
+    
+            @Column(name = "BLACK")
+            private double black;
+
+    
+    
+            @Column(name = "RED")
+            private int red;
+
+    
+    
+            @Column(name = "GREEN")
+            private int green;
+
+    
+    
+            @Column(name = "BLUE")
+            private int blue;
+
+    
+    
+            @Column(name = "L")
+            private double l;
+
+    
+    
+            @Column(name = "A")
+            private double a;
+
+    
+    
+            @Column(name = "B")
+            private double b;
+
+    
+    
+            @Column(name = "V0")
+            private double v0;
+
+    
+    
+            @Column(name = "V1")
+            private double v1;
+
+    
+    
+            @Column(name = "V2")
+            private double v2;
+
+    
+    
+            @Column(name = "V3")
+            private double v3;
+
+    
+    
+            @Column(name = "V4")
+            private double v4;
+
+    
+    
+            @Column(name = "V5")
+            private double v5;
+
+    
+    
+            @Column(name = "V6")
+            private double v6;
+
+    
+    
+            @Column(name = "V7")
+            private double v7;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "COLOR_SPACE_GUID", foreignKeyColumnName = "GUID")})
+            private ColorSpace colorSpace;
+
+    
+
+     
+         /**
+         * Gets the ColorCode.
+         *
+         * return the ColorCode
+         */
+         @Bindable
+         public int getColorCode()
+         {
+            return colorCode;
+         }
+
+         /**
+         * Sets the ColorCode.
+         *
+         * @param colorCode the ColorCode
+         */
+         public void setColorCode(int colorCode)
+         {
+            this.colorCode = colorCode;
+            notifyPropertyChanged(BR.colorCode);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Cyan.
+         *
+         * return the Cyan
+         */
+         @Bindable
+         public double getCyan()
+         {
+            return cyan;
+         }
+
+         /**
+         * Sets the Cyan.
+         *
+         * @param cyan the Cyan
+         */
+         public void setCyan(double cyan)
+         {
+            this.cyan = cyan;
+            notifyPropertyChanged(BR.cyan);
+         }
+     
+     
+         /**
+         * Gets the Magenta.
+         *
+         * return the Magenta
+         */
+         @Bindable
+         public double getMagenta()
+         {
+            return magenta;
+         }
+
+         /**
+         * Sets the Magenta.
+         *
+         * @param magenta the Magenta
+         */
+         public void setMagenta(double magenta)
+         {
+            this.magenta = magenta;
+            notifyPropertyChanged(BR.magenta);
+         }
+     
+     
+         /**
+         * Gets the Yellow.
+         *
+         * return the Yellow
+         */
+         @Bindable
+         public double getYellow()
+         {
+            return yellow;
+         }
+
+         /**
+         * Sets the Yellow.
+         *
+         * @param yellow the Yellow
+         */
+         public void setYellow(double yellow)
+         {
+            this.yellow = yellow;
+            notifyPropertyChanged(BR.yellow);
+         }
+     
+     
+         /**
+         * Gets the Black.
+         *
+         * return the Black
+         */
+         @Bindable
+         public double getBlack()
+         {
+            return black;
+         }
+
+         /**
+         * Sets the Black.
+         *
+         * @param black the Black
+         */
+         public void setBlack(double black)
+         {
+            this.black = black;
+            notifyPropertyChanged(BR.black);
+         }
+     
+     
+         /**
+         * Gets the Red.
+         *
+         * return the Red
+         */
+         @Bindable
+         public int getRed()
+         {
+            return red;
+         }
+
+         /**
+         * Sets the Red.
+         *
+         * @param red the Red
+         */
+         public void setRed(int red)
+         {
+            this.red = red;
+            notifyPropertyChanged(BR.red);
+         }
+     
+     
+         /**
+         * Gets the Green.
+         *
+         * return the Green
+         */
+         @Bindable
+         public int getGreen()
+         {
+            return green;
+         }
+
+         /**
+         * Sets the Green.
+         *
+         * @param green the Green
+         */
+         public void setGreen(int green)
+         {
+            this.green = green;
+            notifyPropertyChanged(BR.green);
+         }
+     
+     
+         /**
+         * Gets the Blue.
+         *
+         * return the Blue
+         */
+         @Bindable
+         public int getBlue()
+         {
+            return blue;
+         }
+
+         /**
+         * Sets the Blue.
+         *
+         * @param blue the Blue
+         */
+         public void setBlue(int blue)
+         {
+            this.blue = blue;
+            notifyPropertyChanged(BR.blue);
+         }
+     
+     
+         /**
+         * Gets the L.
+         *
+         * return the L
+         */
+         @Bindable
+         public double getL()
+         {
+            return l;
+         }
+
+         /**
+         * Sets the L.
+         *
+         * @param l the L
+         */
+         public void setL(double l)
+         {
+            this.l = l;
+            notifyPropertyChanged(BR.l);
+         }
+     
+     
+         /**
+         * Gets the A.
+         *
+         * return the A
+         */
+         @Bindable
+         public double getA()
+         {
+            return a;
+         }
+
+         /**
+         * Sets the A.
+         *
+         * @param a the A
+         */
+         public void setA(double a)
+         {
+            this.a = a;
+            notifyPropertyChanged(BR.a);
+         }
+     
+     
+         /**
+         * Gets the B.
+         *
+         * return the B
+         */
+         @Bindable
+         public double getB()
+         {
+            return b;
+         }
+
+         /**
+         * Sets the B.
+         *
+         * @param b the B
+         */
+         public void setB(double b)
+         {
+            this.b = b;
+            notifyPropertyChanged(BR.b);
+         }
+     
+     
+         /**
+         * Gets the V0.
+         *
+         * return the V0
+         */
+         @Bindable
+         public double getV0()
+         {
+            return v0;
+         }
+
+         /**
+         * Sets the V0.
+         *
+         * @param v0 the V0
+         */
+         public void setV0(double v0)
+         {
+            this.v0 = v0;
+            notifyPropertyChanged(BR.v0);
+         }
+     
+     
+         /**
+         * Gets the V1.
+         *
+         * return the V1
+         */
+         @Bindable
+         public double getV1()
+         {
+            return v1;
+         }
+
+         /**
+         * Sets the V1.
+         *
+         * @param v1 the V1
+         */
+         public void setV1(double v1)
+         {
+            this.v1 = v1;
+            notifyPropertyChanged(BR.v1);
+         }
+     
+     
+         /**
+         * Gets the V2.
+         *
+         * return the V2
+         */
+         @Bindable
+         public double getV2()
+         {
+            return v2;
+         }
+
+         /**
+         * Sets the V2.
+         *
+         * @param v2 the V2
+         */
+         public void setV2(double v2)
+         {
+            this.v2 = v2;
+            notifyPropertyChanged(BR.v2);
+         }
+     
+     
+         /**
+         * Gets the V3.
+         *
+         * return the V3
+         */
+         @Bindable
+         public double getV3()
+         {
+            return v3;
+         }
+
+         /**
+         * Sets the V3.
+         *
+         * @param v3 the V3
+         */
+         public void setV3(double v3)
+         {
+            this.v3 = v3;
+            notifyPropertyChanged(BR.v3);
+         }
+     
+     
+         /**
+         * Gets the V4.
+         *
+         * return the V4
+         */
+         @Bindable
+         public double getV4()
+         {
+            return v4;
+         }
+
+         /**
+         * Sets the V4.
+         *
+         * @param v4 the V4
+         */
+         public void setV4(double v4)
+         {
+            this.v4 = v4;
+            notifyPropertyChanged(BR.v4);
+         }
+     
+     
+         /**
+         * Gets the V5.
+         *
+         * return the V5
+         */
+         @Bindable
+         public double getV5()
+         {
+            return v5;
+         }
+
+         /**
+         * Sets the V5.
+         *
+         * @param v5 the V5
+         */
+         public void setV5(double v5)
+         {
+            this.v5 = v5;
+            notifyPropertyChanged(BR.v5);
+         }
+     
+     
+         /**
+         * Gets the V6.
+         *
+         * return the V6
+         */
+         @Bindable
+         public double getV6()
+         {
+            return v6;
+         }
+
+         /**
+         * Sets the V6.
+         *
+         * @param v6 the V6
+         */
+         public void setV6(double v6)
+         {
+            this.v6 = v6;
+            notifyPropertyChanged(BR.v6);
+         }
+     
+     
+         /**
+         * Gets the V7.
+         *
+         * return the V7
+         */
+         @Bindable
+         public double getV7()
+         {
+            return v7;
+         }
+
+         /**
+         * Sets the V7.
+         *
+         * @param v7 the V7
+         */
+         public void setV7(double v7)
+         {
+            this.v7 = v7;
+            notifyPropertyChanged(BR.v7);
+         }
+     
+     
+         /**
+         * Gets the ColorSpace.
+         *
+         * return the ColorSpace
+         */
+         @Bindable
+         public ColorSpace getColorSpace()
+         {
+            return colorSpace;
+         }
+
+         /**
+         * Sets the ColorSpace.
+         *
+         * @param colorSpace the ColorSpace
+         */
+         public void setColorSpace(ColorSpace colorSpace)
+         {
+            this.colorSpace = colorSpace;
+            notifyPropertyChanged(BR.colorSpace);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java
index e97b97089..98fdae627 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpace.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "COLOR_SPACES", database = TangoDB.class, cachingEnabled = true)
+public class ColorSpace extends ColorSpaceBase
+{
 
-    @Table(name = "COLOR_SPACES", database = TangoDB.class)
-    public class ColorSpace extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpaceBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpaceBase.java
new file mode 100644
index 000000000..3b87e7b3a
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ColorSpaceBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class ColorSpaceBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java
index 0dd96c07b..5553c67e8 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java
@@ -1,270 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "CONFIGURATIONS", database = TangoDB.class, cachingEnabled = true)
+public class Configuration extends ConfigurationBase
+{
 
-    @Table(name = "CONFIGURATIONS", database = TangoDB.class)
-    public class Configuration extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CREATION_DATE")
-            private DateTime creationDate;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_DISPLAY_PANEL_VERSIONS_GUID", foreignKeyColumnName = "GUID")})
-            private ApplicationDisplayPanelVersion applicationDisplayPanelVersions;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_FIRMWARE_VERSIONS_GUID", foreignKeyColumnName = "GUID")})
-            private ApplicationFirmwareVersion applicationFirmwareVersions;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_OS_VERSIONS_GUID", foreignKeyColumnName = "GUID")})
-            private ApplicationOsVersion applicationOsVersions;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_VERSIONS_GUID", foreignKeyColumnName = "GUID")})
-            private ApplicationVersion applicationVersions;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "EMBEDDED_FIRMWARE_VERSIONS_GUID", foreignKeyColumnName = "GUID")})
-            private EmbeddedFirmwareVersion embeddedFirmwareVersions;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "EMBEDDED_SOFTWARE_VERSIONS_GUID", foreignKeyColumnName = "GUID")})
-            private EmbeddedSoftwareVersion embeddedSoftwareVersions;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSIONS_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareVersion hardwareVersions;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the CreationDate.
-         *
-         * return the CreationDate
-         */
-         @Bindable
-         public DateTime getCreationDate()
-         {
-            return creationDate;
-         }
-
-         /**
-         * Sets the CreationDate.
-         *
-         * @param creationDate the CreationDate
-         */
-         public void setCreationDate(DateTime creationDate)
-         {
-            this.creationDate = creationDate;
-            notifyPropertyChanged(BR.creationDate);
-         }
-     
-     
-         /**
-         * Gets the ApplicationDisplayPanelVersions.
-         *
-         * return the ApplicationDisplayPanelVersions
-         */
-         @Bindable
-         public ApplicationDisplayPanelVersion getApplicationDisplayPanelVersions()
-         {
-            return applicationDisplayPanelVersions;
-         }
-
-         /**
-         * Sets the ApplicationDisplayPanelVersions.
-         *
-         * @param applicationDisplayPanelVersions the ApplicationDisplayPanelVersions
-         */
-         public void setApplicationDisplayPanelVersions(ApplicationDisplayPanelVersion applicationDisplayPanelVersions)
-         {
-            this.applicationDisplayPanelVersions = applicationDisplayPanelVersions;
-            notifyPropertyChanged(BR.applicationDisplayPanelVersions);
-         }
-     
-     
-         /**
-         * Gets the ApplicationFirmwareVersions.
-         *
-         * return the ApplicationFirmwareVersions
-         */
-         @Bindable
-         public ApplicationFirmwareVersion getApplicationFirmwareVersions()
-         {
-            return applicationFirmwareVersions;
-         }
-
-         /**
-         * Sets the ApplicationFirmwareVersions.
-         *
-         * @param applicationFirmwareVersions the ApplicationFirmwareVersions
-         */
-         public void setApplicationFirmwareVersions(ApplicationFirmwareVersion applicationFirmwareVersions)
-         {
-            this.applicationFirmwareVersions = applicationFirmwareVersions;
-            notifyPropertyChanged(BR.applicationFirmwareVersions);
-         }
-     
-     
-         /**
-         * Gets the ApplicationOsVersions.
-         *
-         * return the ApplicationOsVersions
-         */
-         @Bindable
-         public ApplicationOsVersion getApplicationOsVersions()
-         {
-            return applicationOsVersions;
-         }
-
-         /**
-         * Sets the ApplicationOsVersions.
-         *
-         * @param applicationOsVersions the ApplicationOsVersions
-         */
-         public void setApplicationOsVersions(ApplicationOsVersion applicationOsVersions)
-         {
-            this.applicationOsVersions = applicationOsVersions;
-            notifyPropertyChanged(BR.applicationOsVersions);
-         }
-     
-     
-         /**
-         * Gets the ApplicationVersions.
-         *
-         * return the ApplicationVersions
-         */
-         @Bindable
-         public ApplicationVersion getApplicationVersions()
-         {
-            return applicationVersions;
-         }
-
-         /**
-         * Sets the ApplicationVersions.
-         *
-         * @param applicationVersions the ApplicationVersions
-         */
-         public void setApplicationVersions(ApplicationVersion applicationVersions)
-         {
-            this.applicationVersions = applicationVersions;
-            notifyPropertyChanged(BR.applicationVersions);
-         }
-     
-     
-         /**
-         * Gets the EmbeddedFirmwareVersions.
-         *
-         * return the EmbeddedFirmwareVersions
-         */
-         @Bindable
-         public EmbeddedFirmwareVersion getEmbeddedFirmwareVersions()
-         {
-            return embeddedFirmwareVersions;
-         }
-
-         /**
-         * Sets the EmbeddedFirmwareVersions.
-         *
-         * @param embeddedFirmwareVersions the EmbeddedFirmwareVersions
-         */
-         public void setEmbeddedFirmwareVersions(EmbeddedFirmwareVersion embeddedFirmwareVersions)
-         {
-            this.embeddedFirmwareVersions = embeddedFirmwareVersions;
-            notifyPropertyChanged(BR.embeddedFirmwareVersions);
-         }
-     
-     
-         /**
-         * Gets the EmbeddedSoftwareVersions.
-         *
-         * return the EmbeddedSoftwareVersions
-         */
-         @Bindable
-         public EmbeddedSoftwareVersion getEmbeddedSoftwareVersions()
-         {
-            return embeddedSoftwareVersions;
-         }
-
-         /**
-         * Sets the EmbeddedSoftwareVersions.
-         *
-         * @param embeddedSoftwareVersions the EmbeddedSoftwareVersions
-         */
-         public void setEmbeddedSoftwareVersions(EmbeddedSoftwareVersion embeddedSoftwareVersions)
-         {
-            this.embeddedSoftwareVersions = embeddedSoftwareVersions;
-            notifyPropertyChanged(BR.embeddedSoftwareVersions);
-         }
-     
-     
-         /**
-         * Gets the HardwareVersions.
-         *
-         * return the HardwareVersions
-         */
-         @Bindable
-         public HardwareVersion getHardwareVersions()
-         {
-            return hardwareVersions;
-         }
-
-         /**
-         * Sets the HardwareVersions.
-         *
-         * @param hardwareVersions the HardwareVersions
-         */
-         public void setHardwareVersions(HardwareVersion hardwareVersions)
-         {
-            this.hardwareVersions = hardwareVersions;
-            notifyPropertyChanged(BR.hardwareVersions);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ConfigurationBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ConfigurationBase.java
new file mode 100644
index 000000000..9a85aaaae
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ConfigurationBase.java
@@ -0,0 +1,267 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class ConfigurationBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "CREATION_DATE")
+            private DateTime creationDate;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_DISPLAY_PANEL_VERSION_GUID", foreignKeyColumnName = "GUID")})
+            private ApplicationDisplayPanelVersion applicationDisplayPanelVersion;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_FIRMWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
+            private ApplicationFirmwareVersion applicationFirmwareVersion;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_OS_VERSION_GUID", foreignKeyColumnName = "GUID")})
+            private ApplicationOsVersion applicationOsVersion;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "APPLICATION_VERSION_GUID", foreignKeyColumnName = "GUID")})
+            private ApplicationVersion applicationVersion;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "EMBEDDED_FIRMWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
+            private EmbeddedFirmwareVersion embeddedFirmwareVersion;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "EMBEDDED_SOFTWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
+            private EmbeddedSoftwareVersion embeddedSoftwareVersion;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
+            private HardwareVersion hardwareVersion;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the CreationDate.
+         *
+         * return the CreationDate
+         */
+         @Bindable
+         public DateTime getCreationDate()
+         {
+            return creationDate;
+         }
+
+         /**
+         * Sets the CreationDate.
+         *
+         * @param creationDate the CreationDate
+         */
+         public void setCreationDate(DateTime creationDate)
+         {
+            this.creationDate = creationDate;
+            notifyPropertyChanged(BR.creationDate);
+         }
+     
+     
+         /**
+         * Gets the ApplicationDisplayPanelVersion.
+         *
+         * return the ApplicationDisplayPanelVersion
+         */
+         @Bindable
+         public ApplicationDisplayPanelVersion getApplicationDisplayPanelVersion()
+         {
+            return applicationDisplayPanelVersion;
+         }
+
+         /**
+         * Sets the ApplicationDisplayPanelVersion.
+         *
+         * @param applicationDisplayPanelVersion the ApplicationDisplayPanelVersion
+         */
+         public void setApplicationDisplayPanelVersion(ApplicationDisplayPanelVersion applicationDisplayPanelVersion)
+         {
+            this.applicationDisplayPanelVersion = applicationDisplayPanelVersion;
+            notifyPropertyChanged(BR.applicationDisplayPanelVersion);
+         }
+     
+     
+         /**
+         * Gets the ApplicationFirmwareVersion.
+         *
+         * return the ApplicationFirmwareVersion
+         */
+         @Bindable
+         public ApplicationFirmwareVersion getApplicationFirmwareVersion()
+         {
+            return applicationFirmwareVersion;
+         }
+
+         /**
+         * Sets the ApplicationFirmwareVersion.
+         *
+         * @param applicationFirmwareVersion the ApplicationFirmwareVersion
+         */
+         public void setApplicationFirmwareVersion(ApplicationFirmwareVersion applicationFirmwareVersion)
+         {
+            this.applicationFirmwareVersion = applicationFirmwareVersion;
+            notifyPropertyChanged(BR.applicationFirmwareVersion);
+         }
+     
+     
+         /**
+         * Gets the ApplicationOsVersion.
+         *
+         * return the ApplicationOsVersion
+         */
+         @Bindable
+         public ApplicationOsVersion getApplicationOsVersion()
+         {
+            return applicationOsVersion;
+         }
+
+         /**
+         * Sets the ApplicationOsVersion.
+         *
+         * @param applicationOsVersion the ApplicationOsVersion
+         */
+         public void setApplicationOsVersion(ApplicationOsVersion applicationOsVersion)
+         {
+            this.applicationOsVersion = applicationOsVersion;
+            notifyPropertyChanged(BR.applicationOsVersion);
+         }
+     
+     
+         /**
+         * Gets the ApplicationVersion.
+         *
+         * return the ApplicationVersion
+         */
+         @Bindable
+         public ApplicationVersion getApplicationVersion()
+         {
+            return applicationVersion;
+         }
+
+         /**
+         * Sets the ApplicationVersion.
+         *
+         * @param applicationVersion the ApplicationVersion
+         */
+         public void setApplicationVersion(ApplicationVersion applicationVersion)
+         {
+            this.applicationVersion = applicationVersion;
+            notifyPropertyChanged(BR.applicationVersion);
+         }
+     
+     
+         /**
+         * Gets the EmbeddedFirmwareVersion.
+         *
+         * return the EmbeddedFirmwareVersion
+         */
+         @Bindable
+         public EmbeddedFirmwareVersion getEmbeddedFirmwareVersion()
+         {
+            return embeddedFirmwareVersion;
+         }
+
+         /**
+         * Sets the EmbeddedFirmwareVersion.
+         *
+         * @param embeddedFirmwareVersion the EmbeddedFirmwareVersion
+         */
+         public void setEmbeddedFirmwareVersion(EmbeddedFirmwareVersion embeddedFirmwareVersion)
+         {
+            this.embeddedFirmwareVersion = embeddedFirmwareVersion;
+            notifyPropertyChanged(BR.embeddedFirmwareVersion);
+         }
+     
+     
+         /**
+         * Gets the EmbeddedSoftwareVersion.
+         *
+         * return the EmbeddedSoftwareVersion
+         */
+         @Bindable
+         public EmbeddedSoftwareVersion getEmbeddedSoftwareVersion()
+         {
+            return embeddedSoftwareVersion;
+         }
+
+         /**
+         * Sets the EmbeddedSoftwareVersion.
+         *
+         * @param embeddedSoftwareVersion the EmbeddedSoftwareVersion
+         */
+         public void setEmbeddedSoftwareVersion(EmbeddedSoftwareVersion embeddedSoftwareVersion)
+         {
+            this.embeddedSoftwareVersion = embeddedSoftwareVersion;
+            notifyPropertyChanged(BR.embeddedSoftwareVersion);
+         }
+     
+     
+         /**
+         * Gets the HardwareVersion.
+         *
+         * return the HardwareVersion
+         */
+         @Bindable
+         public HardwareVersion getHardwareVersion()
+         {
+            return hardwareVersion;
+         }
+
+         /**
+         * Sets the HardwareVersion.
+         *
+         * @param hardwareVersion the HardwareVersion
+         */
+         public void setHardwareVersion(HardwareVersion hardwareVersion)
+         {
+            this.hardwareVersion = hardwareVersion;
+            notifyPropertyChanged(BR.hardwareVersion);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java
index 8480ef8ac..cad78abe5 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Contact.java
@@ -1,214 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "CONTACTS", database = TangoDB.class, cachingEnabled = true)
+public class Contact extends ContactBase
+{
 
-    @Table(name = "CONTACTS", database = TangoDB.class)
-    public class Contact extends Entity 
-    {
     
-            @Column(name = "DELETED")
-            private boolean deleted;
-
-    
-    
-            @Column(name = "FIRST_NAME")
-            private String firstName;
-
-    
-    
-            @Column(name = "LAST_NAME")
-            private String lastName;
-
-    
-    
-            @Column(name = "FULL_NAME")
-            private String fullName;
-
-    
-    
-            @Column(name = "EMAIL")
-            private String email;
-
-    
-    
-            @Column(name = "PHONE_NUMBER")
-            private String phoneNumber;
-
-    
-    
-            @Column(name = "FAX")
-            private String fax;
-
-    
-
-     
-         /**
-         * Gets the Deleted.
-         *
-         * return the Deleted
-         */
-         @Bindable
-         public boolean isDeleted()
-         {
-            return deleted;
-         }
-
-         /**
-         * Sets the Deleted.
-         *
-         * @param deleted the Deleted
-         */
-         public void setDeleted(boolean deleted)
-         {
-            this.deleted = deleted;
-            notifyPropertyChanged(BR.deleted);
-         }
-     
-     
-         /**
-         * Gets the FirstName.
-         *
-         * return the FirstName
-         */
-         @Bindable
-         public String getFirstName()
-         {
-            return firstName;
-         }
-
-         /**
-         * Sets the FirstName.
-         *
-         * @param firstName the FirstName
-         */
-         public void setFirstName(String firstName)
-         {
-            this.firstName = firstName;
-            notifyPropertyChanged(BR.firstName);
-         }
-     
-     
-         /**
-         * Gets the LastName.
-         *
-         * return the LastName
-         */
-         @Bindable
-         public String getLastName()
-         {
-            return lastName;
-         }
-
-         /**
-         * Sets the LastName.
-         *
-         * @param lastName the LastName
-         */
-         public void setLastName(String lastName)
-         {
-            this.lastName = lastName;
-            notifyPropertyChanged(BR.lastName);
-         }
-     
-     
-         /**
-         * Gets the FullName.
-         *
-         * return the FullName
-         */
-         @Bindable
-         public String getFullName()
-         {
-            return fullName;
-         }
-
-         /**
-         * Sets the FullName.
-         *
-         * @param fullName the FullName
-         */
-         public void setFullName(String fullName)
-         {
-            this.fullName = fullName;
-            notifyPropertyChanged(BR.fullName);
-         }
-     
-     
-         /**
-         * Gets the Email.
-         *
-         * return the Email
-         */
-         @Bindable
-         public String getEmail()
-         {
-            return email;
-         }
-
-         /**
-         * Sets the Email.
-         *
-         * @param email the Email
-         */
-         public void setEmail(String email)
-         {
-            this.email = email;
-            notifyPropertyChanged(BR.email);
-         }
-     
-     
-         /**
-         * Gets the PhoneNumber.
-         *
-         * return the PhoneNumber
-         */
-         @Bindable
-         public String getPhoneNumber()
-         {
-            return phoneNumber;
-         }
-
-         /**
-         * Sets the PhoneNumber.
-         *
-         * @param phoneNumber the PhoneNumber
-         */
-         public void setPhoneNumber(String phoneNumber)
-         {
-            this.phoneNumber = phoneNumber;
-            notifyPropertyChanged(BR.phoneNumber);
-         }
-     
-     
-         /**
-         * Gets the Fax.
-         *
-         * return the Fax
-         */
-         @Bindable
-         public String getFax()
-         {
-            return fax;
-         }
-
-         /**
-         * Sets the Fax.
-         *
-         * @param fax the Fax
-         */
-         public void setFax(String fax)
-         {
-            this.fax = fax;
-            notifyPropertyChanged(BR.fax);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ContactBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ContactBase.java
new file mode 100644
index 000000000..daf4d4483
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ContactBase.java
@@ -0,0 +1,211 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class ContactBase extends Entity 
+    {
+    
+            @Column(name = "DELETED")
+            private boolean deleted;
+
+    
+    
+            @Column(name = "FIRST_NAME")
+            private String firstName;
+
+    
+    
+            @Column(name = "LAST_NAME")
+            private String lastName;
+
+    
+    
+            @Column(name = "FULL_NAME")
+            private String fullName;
+
+    
+    
+            @Column(name = "EMAIL")
+            private String email;
+
+    
+    
+            @Column(name = "PHONE_NUMBER")
+            private String phoneNumber;
+
+    
+    
+            @Column(name = "FAX")
+            private String fax;
+
+    
+
+     
+         /**
+         * Gets the Deleted.
+         *
+         * return the Deleted
+         */
+         @Bindable
+         public boolean isDeleted()
+         {
+            return deleted;
+         }
+
+         /**
+         * Sets the Deleted.
+         *
+         * @param deleted the Deleted
+         */
+         public void setDeleted(boolean deleted)
+         {
+            this.deleted = deleted;
+            notifyPropertyChanged(BR.deleted);
+         }
+     
+     
+         /**
+         * Gets the FirstName.
+         *
+         * return the FirstName
+         */
+         @Bindable
+         public String getFirstName()
+         {
+            return firstName;
+         }
+
+         /**
+         * Sets the FirstName.
+         *
+         * @param firstName the FirstName
+         */
+         public void setFirstName(String firstName)
+         {
+            this.firstName = firstName;
+            notifyPropertyChanged(BR.firstName);
+         }
+     
+     
+         /**
+         * Gets the LastName.
+         *
+         * return the LastName
+         */
+         @Bindable
+         public String getLastName()
+         {
+            return lastName;
+         }
+
+         /**
+         * Sets the LastName.
+         *
+         * @param lastName the LastName
+         */
+         public void setLastName(String lastName)
+         {
+            this.lastName = lastName;
+            notifyPropertyChanged(BR.lastName);
+         }
+     
+     
+         /**
+         * Gets the FullName.
+         *
+         * return the FullName
+         */
+         @Bindable
+         public String getFullName()
+         {
+            return fullName;
+         }
+
+         /**
+         * Sets the FullName.
+         *
+         * @param fullName the FullName
+         */
+         public void setFullName(String fullName)
+         {
+            this.fullName = fullName;
+            notifyPropertyChanged(BR.fullName);
+         }
+     
+     
+         /**
+         * Gets the Email.
+         *
+         * return the Email
+         */
+         @Bindable
+         public String getEmail()
+         {
+            return email;
+         }
+
+         /**
+         * Sets the Email.
+         *
+         * @param email the Email
+         */
+         public void setEmail(String email)
+         {
+            this.email = email;
+            notifyPropertyChanged(BR.email);
+         }
+     
+     
+         /**
+         * Gets the PhoneNumber.
+         *
+         * return the PhoneNumber
+         */
+         @Bindable
+         public String getPhoneNumber()
+         {
+            return phoneNumber;
+         }
+
+         /**
+         * Sets the PhoneNumber.
+         *
+         * @param phoneNumber the PhoneNumber
+         */
+         public void setPhoneNumber(String phoneNumber)
+         {
+            this.phoneNumber = phoneNumber;
+            notifyPropertyChanged(BR.phoneNumber);
+         }
+     
+     
+         /**
+         * Gets the Fax.
+         *
+         * return the Fax
+         */
+         @Bindable
+         public String getFax()
+         {
+            return fax;
+         }
+
+         /**
+         * Sets the Fax.
+         *
+         * @param fax the Fax
+         */
+         public void setFax(String fax)
+         {
+            this.fax = fax;
+            notifyPropertyChanged(BR.fax);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java
index 2aacd834f..62ab942bd 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java
@@ -1,466 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "DISPENSER_TYPES", database = TangoDB.class, cachingEnabled = true)
+public class DispenserType extends DispenserTypeBase
+{
 
-    @Table(name = "DISPENSER_TYPES", database = TangoDB.class)
-    public class DispenserType extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "NL_PER_PULSE")
-            private double nlPerPulse;
-
-    
-    
-            @Column(name = "CAPACITY")
-            private double capacity;
-
-    
-    
-            @Column(name = "MIN_FREQUENCY")
-            private int minFrequency;
-
-    
-    
-            @Column(name = "MAX_FREQUENCY")
-            private int maxFrequency;
-
-    
-    
-            @Column(name = "MIN_MICRO_STEP")
-            private int minMicroStep;
-
-    
-    
-            @Column(name = "MAX_MICRO_STEP")
-            private int maxMicroStep;
-
-    
-    
-            @Column(name = "CORRECTION_GAIN")
-            private double correctionGain;
-
-    
-    
-            @Column(name = "RATIO_TO_DRYER_SPEED")
-            private double ratioToDryerSpeed;
-
-    
-    
-            @Column(name = "KP")
-            private double kp;
-
-    
-    
-            @Column(name = "KI")
-            private double ki;
-
-    
-    
-            @Column(name = "KD")
-            private double kd;
-
-    
-    
-            @Column(name = "CHANGE_SLOPE")
-            private double changeSlope;
-
-    
-    
-            @Column(name = "HIGH_LENGTH_MICRO_SECOND")
-            private double highLengthMicroSecond;
-
-    
-    
-            @Column(name = "CONTROL_TIMING")
-            private int controlTiming;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the NlPerPulse.
-         *
-         * return the NlPerPulse
-         */
-         @Bindable
-         public double getNlPerPulse()
-         {
-            return nlPerPulse;
-         }
-
-         /**
-         * Sets the NlPerPulse.
-         *
-         * @param nlPerPulse the NlPerPulse
-         */
-         public void setNlPerPulse(double nlPerPulse)
-         {
-            this.nlPerPulse = nlPerPulse;
-            notifyPropertyChanged(BR.nlPerPulse);
-         }
-     
-     
-         /**
-         * Gets the Capacity.
-         *
-         * return the Capacity
-         */
-         @Bindable
-         public double getCapacity()
-         {
-            return capacity;
-         }
-
-         /**
-         * Sets the Capacity.
-         *
-         * @param capacity the Capacity
-         */
-         public void setCapacity(double capacity)
-         {
-            this.capacity = capacity;
-            notifyPropertyChanged(BR.capacity);
-         }
-     
-     
-         /**
-         * Gets the MinFrequency.
-         *
-         * return the MinFrequency
-         */
-         @Bindable
-         public int getMinFrequency()
-         {
-            return minFrequency;
-         }
-
-         /**
-         * Sets the MinFrequency.
-         *
-         * @param minFrequency the MinFrequency
-         */
-         public void setMinFrequency(int minFrequency)
-         {
-            this.minFrequency = minFrequency;
-            notifyPropertyChanged(BR.minFrequency);
-         }
-     
-     
-         /**
-         * Gets the MaxFrequency.
-         *
-         * return the MaxFrequency
-         */
-         @Bindable
-         public int getMaxFrequency()
-         {
-            return maxFrequency;
-         }
-
-         /**
-         * Sets the MaxFrequency.
-         *
-         * @param maxFrequency the MaxFrequency
-         */
-         public void setMaxFrequency(int maxFrequency)
-         {
-            this.maxFrequency = maxFrequency;
-            notifyPropertyChanged(BR.maxFrequency);
-         }
-     
-     
-         /**
-         * Gets the MinMicroStep.
-         *
-         * return the MinMicroStep
-         */
-         @Bindable
-         public int getMinMicroStep()
-         {
-            return minMicroStep;
-         }
-
-         /**
-         * Sets the MinMicroStep.
-         *
-         * @param minMicroStep the MinMicroStep
-         */
-         public void setMinMicroStep(int minMicroStep)
-         {
-            this.minMicroStep = minMicroStep;
-            notifyPropertyChanged(BR.minMicroStep);
-         }
-     
-     
-         /**
-         * Gets the MaxMicroStep.
-         *
-         * return the MaxMicroStep
-         */
-         @Bindable
-         public int getMaxMicroStep()
-         {
-            return maxMicroStep;
-         }
-
-         /**
-         * Sets the MaxMicroStep.
-         *
-         * @param maxMicroStep the MaxMicroStep
-         */
-         public void setMaxMicroStep(int maxMicroStep)
-         {
-            this.maxMicroStep = maxMicroStep;
-            notifyPropertyChanged(BR.maxMicroStep);
-         }
-     
-     
-         /**
-         * Gets the CorrectionGain.
-         *
-         * return the CorrectionGain
-         */
-         @Bindable
-         public double getCorrectionGain()
-         {
-            return correctionGain;
-         }
-
-         /**
-         * Sets the CorrectionGain.
-         *
-         * @param correctionGain the CorrectionGain
-         */
-         public void setCorrectionGain(double correctionGain)
-         {
-            this.correctionGain = correctionGain;
-            notifyPropertyChanged(BR.correctionGain);
-         }
-     
-     
-         /**
-         * Gets the RatioToDryerSpeed.
-         *
-         * return the RatioToDryerSpeed
-         */
-         @Bindable
-         public double getRatioToDryerSpeed()
-         {
-            return ratioToDryerSpeed;
-         }
-
-         /**
-         * Sets the RatioToDryerSpeed.
-         *
-         * @param ratioToDryerSpeed the RatioToDryerSpeed
-         */
-         public void setRatioToDryerSpeed(double ratioToDryerSpeed)
-         {
-            this.ratioToDryerSpeed = ratioToDryerSpeed;
-            notifyPropertyChanged(BR.ratioToDryerSpeed);
-         }
-     
-     
-         /**
-         * Gets the Kp.
-         *
-         * return the Kp
-         */
-         @Bindable
-         public double getKp()
-         {
-            return kp;
-         }
-
-         /**
-         * Sets the Kp.
-         *
-         * @param kp the Kp
-         */
-         public void setKp(double kp)
-         {
-            this.kp = kp;
-            notifyPropertyChanged(BR.kp);
-         }
-     
-     
-         /**
-         * Gets the Ki.
-         *
-         * return the Ki
-         */
-         @Bindable
-         public double getKi()
-         {
-            return ki;
-         }
-
-         /**
-         * Sets the Ki.
-         *
-         * @param ki the Ki
-         */
-         public void setKi(double ki)
-         {
-            this.ki = ki;
-            notifyPropertyChanged(BR.ki);
-         }
-     
-     
-         /**
-         * Gets the Kd.
-         *
-         * return the Kd
-         */
-         @Bindable
-         public double getKd()
-         {
-            return kd;
-         }
-
-         /**
-         * Sets the Kd.
-         *
-         * @param kd the Kd
-         */
-         public void setKd(double kd)
-         {
-            this.kd = kd;
-            notifyPropertyChanged(BR.kd);
-         }
-     
-     
-         /**
-         * Gets the ChangeSlope.
-         *
-         * return the ChangeSlope
-         */
-         @Bindable
-         public double getChangeSlope()
-         {
-            return changeSlope;
-         }
-
-         /**
-         * Sets the ChangeSlope.
-         *
-         * @param changeSlope the ChangeSlope
-         */
-         public void setChangeSlope(double changeSlope)
-         {
-            this.changeSlope = changeSlope;
-            notifyPropertyChanged(BR.changeSlope);
-         }
-     
-     
-         /**
-         * Gets the HighLengthMicroSecond.
-         *
-         * return the HighLengthMicroSecond
-         */
-         @Bindable
-         public double getHighLengthMicroSecond()
-         {
-            return highLengthMicroSecond;
-         }
-
-         /**
-         * Sets the HighLengthMicroSecond.
-         *
-         * @param highLengthMicroSecond the HighLengthMicroSecond
-         */
-         public void setHighLengthMicroSecond(double highLengthMicroSecond)
-         {
-            this.highLengthMicroSecond = highLengthMicroSecond;
-            notifyPropertyChanged(BR.highLengthMicroSecond);
-         }
-     
-     
-         /**
-         * Gets the ControlTiming.
-         *
-         * return the ControlTiming
-         */
-         @Bindable
-         public int getControlTiming()
-         {
-            return controlTiming;
-         }
-
-         /**
-         * Sets the ControlTiming.
-         *
-         * @param controlTiming the ControlTiming
-         */
-         public void setControlTiming(int controlTiming)
-         {
-            this.controlTiming = controlTiming;
-            notifyPropertyChanged(BR.controlTiming);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserTypeBase.java
new file mode 100644
index 000000000..eaf42ba44
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserTypeBase.java
@@ -0,0 +1,463 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class DispenserTypeBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "NL_PER_PULSE")
+            private double nlPerPulse;
+
+    
+    
+            @Column(name = "CAPACITY")
+            private double capacity;
+
+    
+    
+            @Column(name = "MIN_FREQUENCY")
+            private int minFrequency;
+
+    
+    
+            @Column(name = "MAX_FREQUENCY")
+            private int maxFrequency;
+
+    
+    
+            @Column(name = "MIN_MICRO_STEP")
+            private int minMicroStep;
+
+    
+    
+            @Column(name = "MAX_MICRO_STEP")
+            private int maxMicroStep;
+
+    
+    
+            @Column(name = "CORRECTION_GAIN")
+            private double correctionGain;
+
+    
+    
+            @Column(name = "RATIO_TO_DRYER_SPEED")
+            private double ratioToDryerSpeed;
+
+    
+    
+            @Column(name = "KP")
+            private double kp;
+
+    
+    
+            @Column(name = "KI")
+            private double ki;
+
+    
+    
+            @Column(name = "KD")
+            private double kd;
+
+    
+    
+            @Column(name = "CHANGE_SLOPE")
+            private double changeSlope;
+
+    
+    
+            @Column(name = "HIGH_LENGTH_MICRO_SECOND")
+            private double highLengthMicroSecond;
+
+    
+    
+            @Column(name = "CONTROL_TIMING")
+            private int controlTiming;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the NlPerPulse.
+         *
+         * return the NlPerPulse
+         */
+         @Bindable
+         public double getNlPerPulse()
+         {
+            return nlPerPulse;
+         }
+
+         /**
+         * Sets the NlPerPulse.
+         *
+         * @param nlPerPulse the NlPerPulse
+         */
+         public void setNlPerPulse(double nlPerPulse)
+         {
+            this.nlPerPulse = nlPerPulse;
+            notifyPropertyChanged(BR.nlPerPulse);
+         }
+     
+     
+         /**
+         * Gets the Capacity.
+         *
+         * return the Capacity
+         */
+         @Bindable
+         public double getCapacity()
+         {
+            return capacity;
+         }
+
+         /**
+         * Sets the Capacity.
+         *
+         * @param capacity the Capacity
+         */
+         public void setCapacity(double capacity)
+         {
+            this.capacity = capacity;
+            notifyPropertyChanged(BR.capacity);
+         }
+     
+     
+         /**
+         * Gets the MinFrequency.
+         *
+         * return the MinFrequency
+         */
+         @Bindable
+         public int getMinFrequency()
+         {
+            return minFrequency;
+         }
+
+         /**
+         * Sets the MinFrequency.
+         *
+         * @param minFrequency the MinFrequency
+         */
+         public void setMinFrequency(int minFrequency)
+         {
+            this.minFrequency = minFrequency;
+            notifyPropertyChanged(BR.minFrequency);
+         }
+     
+     
+         /**
+         * Gets the MaxFrequency.
+         *
+         * return the MaxFrequency
+         */
+         @Bindable
+         public int getMaxFrequency()
+         {
+            return maxFrequency;
+         }
+
+         /**
+         * Sets the MaxFrequency.
+         *
+         * @param maxFrequency the MaxFrequency
+         */
+         public void setMaxFrequency(int maxFrequency)
+         {
+            this.maxFrequency = maxFrequency;
+            notifyPropertyChanged(BR.maxFrequency);
+         }
+     
+     
+         /**
+         * Gets the MinMicroStep.
+         *
+         * return the MinMicroStep
+         */
+         @Bindable
+         public int getMinMicroStep()
+         {
+            return minMicroStep;
+         }
+
+         /**
+         * Sets the MinMicroStep.
+         *
+         * @param minMicroStep the MinMicroStep
+         */
+         public void setMinMicroStep(int minMicroStep)
+         {
+            this.minMicroStep = minMicroStep;
+            notifyPropertyChanged(BR.minMicroStep);
+         }
+     
+     
+         /**
+         * Gets the MaxMicroStep.
+         *
+         * return the MaxMicroStep
+         */
+         @Bindable
+         public int getMaxMicroStep()
+         {
+            return maxMicroStep;
+         }
+
+         /**
+         * Sets the MaxMicroStep.
+         *
+         * @param maxMicroStep the MaxMicroStep
+         */
+         public void setMaxMicroStep(int maxMicroStep)
+         {
+            this.maxMicroStep = maxMicroStep;
+            notifyPropertyChanged(BR.maxMicroStep);
+         }
+     
+     
+         /**
+         * Gets the CorrectionGain.
+         *
+         * return the CorrectionGain
+         */
+         @Bindable
+         public double getCorrectionGain()
+         {
+            return correctionGain;
+         }
+
+         /**
+         * Sets the CorrectionGain.
+         *
+         * @param correctionGain the CorrectionGain
+         */
+         public void setCorrectionGain(double correctionGain)
+         {
+            this.correctionGain = correctionGain;
+            notifyPropertyChanged(BR.correctionGain);
+         }
+     
+     
+         /**
+         * Gets the RatioToDryerSpeed.
+         *
+         * return the RatioToDryerSpeed
+         */
+         @Bindable
+         public double getRatioToDryerSpeed()
+         {
+            return ratioToDryerSpeed;
+         }
+
+         /**
+         * Sets the RatioToDryerSpeed.
+         *
+         * @param ratioToDryerSpeed the RatioToDryerSpeed
+         */
+         public void setRatioToDryerSpeed(double ratioToDryerSpeed)
+         {
+            this.ratioToDryerSpeed = ratioToDryerSpeed;
+            notifyPropertyChanged(BR.ratioToDryerSpeed);
+         }
+     
+     
+         /**
+         * Gets the Kp.
+         *
+         * return the Kp
+         */
+         @Bindable
+         public double getKp()
+         {
+            return kp;
+         }
+
+         /**
+         * Sets the Kp.
+         *
+         * @param kp the Kp
+         */
+         public void setKp(double kp)
+         {
+            this.kp = kp;
+            notifyPropertyChanged(BR.kp);
+         }
+     
+     
+         /**
+         * Gets the Ki.
+         *
+         * return the Ki
+         */
+         @Bindable
+         public double getKi()
+         {
+            return ki;
+         }
+
+         /**
+         * Sets the Ki.
+         *
+         * @param ki the Ki
+         */
+         public void setKi(double ki)
+         {
+            this.ki = ki;
+            notifyPropertyChanged(BR.ki);
+         }
+     
+     
+         /**
+         * Gets the Kd.
+         *
+         * return the Kd
+         */
+         @Bindable
+         public double getKd()
+         {
+            return kd;
+         }
+
+         /**
+         * Sets the Kd.
+         *
+         * @param kd the Kd
+         */
+         public void setKd(double kd)
+         {
+            this.kd = kd;
+            notifyPropertyChanged(BR.kd);
+         }
+     
+     
+         /**
+         * Gets the ChangeSlope.
+         *
+         * return the ChangeSlope
+         */
+         @Bindable
+         public double getChangeSlope()
+         {
+            return changeSlope;
+         }
+
+         /**
+         * Sets the ChangeSlope.
+         *
+         * @param changeSlope the ChangeSlope
+         */
+         public void setChangeSlope(double changeSlope)
+         {
+            this.changeSlope = changeSlope;
+            notifyPropertyChanged(BR.changeSlope);
+         }
+     
+     
+         /**
+         * Gets the HighLengthMicroSecond.
+         *
+         * return the HighLengthMicroSecond
+         */
+         @Bindable
+         public double getHighLengthMicroSecond()
+         {
+            return highLengthMicroSecond;
+         }
+
+         /**
+         * Sets the HighLengthMicroSecond.
+         *
+         * @param highLengthMicroSecond the HighLengthMicroSecond
+         */
+         public void setHighLengthMicroSecond(double highLengthMicroSecond)
+         {
+            this.highLengthMicroSecond = highLengthMicroSecond;
+            notifyPropertyChanged(BR.highLengthMicroSecond);
+         }
+     
+     
+         /**
+         * Gets the ControlTiming.
+         *
+         * return the ControlTiming
+         */
+         @Bindable
+         public int getControlTiming()
+         {
+            return controlTiming;
+         }
+
+         /**
+         * Sets the ControlTiming.
+         *
+         * @param controlTiming the ControlTiming
+         */
+         public void setControlTiming(int controlTiming)
+         {
+            this.controlTiming = controlTiming;
+            notifyPropertyChanged(BR.controlTiming);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java
index 8c5847f98..ba5b0765c 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "EMBEDDED_FIRMWARE_VERSIONS", database = TangoDB.class, cachingEnabled = true)
+public class EmbeddedFirmwareVersion extends EmbeddedFirmwareVersionBase
+{
 
-    @Table(name = "EMBEDDED_FIRMWARE_VERSIONS", database = TangoDB.class)
-    public class EmbeddedFirmwareVersion extends Entity 
-    {
     
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersionBase.java
new file mode 100644
index 000000000..96399ca0a
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersionBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class EmbeddedFirmwareVersionBase extends Entity 
+    {
+    
+            @Column(name = "VERSION")
+            private double version;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+
+     
+         /**
+         * Gets the Version.
+         *
+         * return the Version
+         */
+         @Bindable
+         public double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(double version)
+         {
+            this.version = version;
+            notifyPropertyChanged(BR.version);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java
index 5275e2d9f..493c8020a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "EMBEDDED_SOFTWARE_VERSIONS", database = TangoDB.class, cachingEnabled = true)
+public class EmbeddedSoftwareVersion extends EmbeddedSoftwareVersionBase
+{
 
-    @Table(name = "EMBEDDED_SOFTWARE_VERSIONS", database = TangoDB.class)
-    public class EmbeddedSoftwareVersion extends Entity 
-    {
     
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersionBase.java
new file mode 100644
index 000000000..1f620a844
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersionBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class EmbeddedSoftwareVersionBase extends Entity 
+    {
+    
+            @Column(name = "VERSION")
+            private double version;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+
+     
+         /**
+         * Gets the Version.
+         *
+         * return the Version
+         */
+         @Bindable
+         public double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(double version)
+         {
+            this.version = version;
+            notifyPropertyChanged(BR.version);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java
index b216de6ab..c91b1c09e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventType.java
@@ -1,158 +1,30 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import com.raizlabs.android.dbflow.annotation.OneToMany;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
+import com.raizlabs.android.dbflow.sql.language.SQLite;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
+import com.twine.tango.dal.dao.TangoDAO;
 
+import java.util.ArrayList;
+import java.util.List;
+import static br.com.zbra.androidlinq.Linq.stream;
 
-    @Table(name = "EVENT_TYPES", database = TangoDB.class)
-    public class EventType extends Entity 
-    {
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_TYPES_GROUPS_GUID", foreignKeyColumnName = "GUID")})
-            private EventTypesGroup eventTypesGroups;
 
+@Table(name = "EVENT_TYPES", database = TangoDB.class, cachingEnabled = true)
+public class EventType extends EventTypeBase
+{
+    private List<ActionType> actionTypes;
     
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_TYPES_CATEGORIES_GUID", foreignKeyColumnName = "GUID")})
-            private EventTypesCategory eventTypesCategories;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the EventTypesGroups.
-         *
-         * return the EventTypesGroups
-         */
-         @Bindable
-         public EventTypesGroup getEventTypesGroups()
-         {
-            return eventTypesGroups;
-         }
-
-         /**
-         * Sets the EventTypesGroups.
-         *
-         * @param eventTypesGroups the EventTypesGroups
-         */
-         public void setEventTypesGroups(EventTypesGroup eventTypesGroups)
-         {
-            this.eventTypesGroups = eventTypesGroups;
-            notifyPropertyChanged(BR.eventTypesGroups);
-         }
-     
-     
-         /**
-         * Gets the EventTypesCategories.
-         *
-         * return the EventTypesCategories
-         */
-         @Bindable
-         public EventTypesCategory getEventTypesCategories()
-         {
-            return eventTypesCategories;
-         }
-
-         /**
-         * Sets the EventTypesCategories.
-         *
-         * @param eventTypesCategories the EventTypesCategories
-         */
-         public void setEventTypesCategories(EventTypesCategory eventTypesCategories)
-         {
-            this.eventTypesCategories = eventTypesCategories;
-            notifyPropertyChanged(BR.eventTypesCategories);
-         }
-     
+    public List<ActionType> getActionTypes()
+    {
+        if (actionTypes == null)
+        {
+            actionTypes = stream(SQLite.select().from(EventTypesAction.class).where(EventTypesAction_Table.EVENT_TYPE_GUID.eq(getGuid())).queryList()).
+                    select(x -> x.getActionType()).toList();
+        }
+        
+        return actionTypes;
     }
+    
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypeBase.java
new file mode 100644
index 000000000..a9d629c52
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypeBase.java
@@ -0,0 +1,155 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ColumnIgnore;
+import com.raizlabs.android.dbflow.annotation.ColumnMap;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+
+import org.joda.time.DateTime;
+
+import com.raizlabs.android.dbflow.annotation.InheritedColumn;
+import com.twine.tango.dal.Entity;
+
+import android.databinding.Bindable;
+
+import com.twine.tango.dal.BR;
+
+
+public abstract class EventTypeBase extends Entity
+{
+    @Column(name = "CODE")
+    private int code;
+    
+    
+    @Column(name = "NAME")
+    private String name;
+    
+    
+    @Column(name = "DESCRIPTION")
+    private String description;
+    
+    
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "EVENT_TYPES_GROUP_GUID", foreignKeyColumnName = "GUID")})
+    private EventTypesGroup eventTypesGroup;
+    
+    
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "EVENT_TYPES_CATEGORY_GUID", foreignKeyColumnName = "GUID")})
+    private EventTypesCategory eventTypesCategory;
+    
+    
+    /**
+     * Gets the Code.
+     * <p>
+     * return the Code
+     */
+    @Bindable
+    public int getCode()
+    {
+        return code;
+    }
+    
+    /**
+     * Sets the Code.
+     *
+     * @param code the Code
+     */
+    public void setCode(int code)
+    {
+        this.code = code;
+        notifyPropertyChanged(BR.code);
+    }
+    
+    
+    /**
+     * Gets the Name.
+     * <p>
+     * return the Name
+     */
+    @Bindable
+    public String getName()
+    {
+        return name;
+    }
+    
+    /**
+     * Sets the Name.
+     *
+     * @param name the Name
+     */
+    public void setName(String name)
+    {
+        this.name = name;
+        notifyPropertyChanged(BR.name);
+    }
+    
+    
+    /**
+     * Gets the Description.
+     * <p>
+     * return the Description
+     */
+    @Bindable
+    public String getDescription()
+    {
+        return description;
+    }
+    
+    /**
+     * Sets the Description.
+     *
+     * @param description the Description
+     */
+    public void setDescription(String description)
+    {
+        this.description = description;
+        notifyPropertyChanged(BR.description);
+    }
+    
+    
+    /**
+     * Gets the EventTypesGroup.
+     * <p>
+     * return the EventTypesGroup
+     */
+    @Bindable
+    public EventTypesGroup getEventTypesGroup()
+    {
+        return eventTypesGroup;
+    }
+    
+    /**
+     * Sets the EventTypesGroup.
+     *
+     * @param eventTypesGroup the EventTypesGroup
+     */
+    public void setEventTypesGroup(EventTypesGroup eventTypesGroup)
+    {
+        this.eventTypesGroup = eventTypesGroup;
+        notifyPropertyChanged(BR.eventTypesGroup);
+    }
+    
+    
+    /**
+     * Gets the EventTypesCategory.
+     * <p>
+     * return the EventTypesCategory
+     */
+    @Bindable
+    public EventTypesCategory getEventTypesCategory()
+    {
+        return eventTypesCategory;
+    }
+    
+    /**
+     * Sets the EventTypesCategory.
+     *
+     * @param eventTypesCategory the EventTypesCategory
+     */
+    public void setEventTypesCategory(EventTypesCategory eventTypesCategory)
+    {
+        this.eventTypesCategory = eventTypesCategory;
+        notifyPropertyChanged(BR.eventTypesCategory);
+    }
+    
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java
index 3426689b6..a4b992130 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesAction.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "EVENT_TYPES_ACTIONS", database = TangoDB.class, cachingEnabled = true)
+public class EventTypesAction extends EventTypesActionBase
+{
 
-    @Table(name = "EVENT_TYPES_ACTIONS", database = TangoDB.class)
-    public class EventTypesAction extends Entity 
-    {
     
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "ACTION_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private ActionType actionTypes;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private EventType eventTypes;
-
-    
-
-     
-         /**
-         * Gets the ActionTypes.
-         *
-         * return the ActionTypes
-         */
-         @Bindable
-         public ActionType getActionTypes()
-         {
-            return actionTypes;
-         }
-
-         /**
-         * Sets the ActionTypes.
-         *
-         * @param actionTypes the ActionTypes
-         */
-         public void setActionTypes(ActionType actionTypes)
-         {
-            this.actionTypes = actionTypes;
-            notifyPropertyChanged(BR.actionTypes);
-         }
-     
-     
-         /**
-         * Gets the EventTypes.
-         *
-         * return the EventTypes
-         */
-         @Bindable
-         public EventType getEventTypes()
-         {
-            return eventTypes;
-         }
-
-         /**
-         * Sets the EventTypes.
-         *
-         * @param eventTypes the EventTypes
-         */
-         public void setEventTypes(EventType eventTypes)
-         {
-            this.eventTypes = eventTypes;
-            notifyPropertyChanged(BR.eventTypes);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesActionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesActionBase.java
new file mode 100644
index 000000000..f26d3e184
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesActionBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+
+import org.joda.time.DateTime;
+
+import com.twine.tango.dal.Entity;
+
+import android.databinding.Bindable;
+
+import com.twine.tango.dal.BR;
+
+
+public abstract class EventTypesActionBase extends Entity
+{
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "ACTION_TYPE_GUID", foreignKeyColumnName = "GUID")})
+    private ActionType actionType;
+    
+    
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "EVENT_TYPE_GUID", foreignKeyColumnName = "GUID")})
+    private EventType eventType;
+    
+    
+    /**
+     * Gets the ActionType.
+     * <p>
+     * return the ActionType
+     */
+    @Bindable
+    public ActionType getActionType()
+    {
+        return actionType;
+    }
+    
+    /**
+     * Sets the ActionType.
+     *
+     * @param actionType the ActionType
+     */
+    public void setActionType(ActionType actionType)
+    {
+        this.actionType = actionType;
+        notifyPropertyChanged(BR.actionType);
+    }
+    
+    
+    /**
+     * Gets the EventType.
+     * <p>
+     * return the EventType
+     */
+    @Bindable
+    public EventType getEventType()
+    {
+        return eventType;
+    }
+    
+    /**
+     * Sets the EventType.
+     *
+     * @param eventType the EventType
+     */
+    public void setEventType(EventType eventType)
+    {
+        this.eventType = eventType;
+        notifyPropertyChanged(BR.eventType);
+    }
+    
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java
index 622550cc8..9b446812e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategory.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "EVENT_TYPES_CATEGORIES", database = TangoDB.class, cachingEnabled = true)
+public class EventTypesCategory extends EventTypesCategoryBase
+{
 
-    @Table(name = "EVENT_TYPES_CATEGORIES", database = TangoDB.class)
-    public class EventTypesCategory extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategoryBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategoryBase.java
new file mode 100644
index 000000000..cd8c5e96f
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesCategoryBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class EventTypesCategoryBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java
index 702abce1e..05ac72aa9 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroup.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "EVENT_TYPES_GROUPS", database = TangoDB.class, cachingEnabled = true)
+public class EventTypesGroup extends EventTypesGroupBase
+{
 
-    @Table(name = "EVENT_TYPES_GROUPS", database = TangoDB.class)
-    public class EventTypesGroup extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroupBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroupBase.java
new file mode 100644
index 000000000..429ac300c
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventTypesGroupBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class EventTypesGroupBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java
index 751912fa7..185a2fc4a 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "FIBER_SHAPES", database = TangoDB.class, cachingEnabled = true)
+public class FiberShape extends FiberShapeBase
+{
 
-    @Table(name = "FIBER_SHAPES", database = TangoDB.class)
-    public class FiberShape extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShapeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShapeBase.java
new file mode 100644
index 000000000..4b77d1b9d
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShapeBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class FiberShapeBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java
index c13852c1a..8bc07151b 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "FIBER_SYNTHS", database = TangoDB.class, cachingEnabled = true)
+public class FiberSynth extends FiberSynthBase
+{
 
-    @Table(name = "FIBER_SYNTHS", database = TangoDB.class)
-    public class FiberSynth extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynthBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynthBase.java
new file mode 100644
index 000000000..5b9ef4df8
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynthBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class FiberSynthBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java
index 25e888fbd..25167d890 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancer.java
@@ -1,186 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "HARDWARE_DANCERS", database = TangoDB.class, cachingEnabled = true)
+public class HardwareDancer extends HardwareDancerBase
+{
 
-    @Table(name = "HARDWARE_DANCERS", database = TangoDB.class)
-    public class HardwareDancer extends Entity 
-    {
     
-            @Column(name = "GRADUAL")
-            private boolean gradual;
-
-    
-    
-            @Column(name = "K")
-            private double k;
-
-    
-    
-            @Column(name = "X")
-            private double x;
-
-    
-    
-            @Column(name = "PULSE_PER_MM_SPRING")
-            private int pulsePerMmSpring;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_DANCER_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareDancerType hardwareDancerTypes;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSIONS_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareVersion hardwareVersions;
-
-    
-
-     
-         /**
-         * Gets the Gradual.
-         *
-         * return the Gradual
-         */
-         @Bindable
-         public boolean isGradual()
-         {
-            return gradual;
-         }
-
-         /**
-         * Sets the Gradual.
-         *
-         * @param gradual the Gradual
-         */
-         public void setGradual(boolean gradual)
-         {
-            this.gradual = gradual;
-            notifyPropertyChanged(BR.gradual);
-         }
-     
-     
-         /**
-         * Gets the K.
-         *
-         * return the K
-         */
-         @Bindable
-         public double getK()
-         {
-            return k;
-         }
-
-         /**
-         * Sets the K.
-         *
-         * @param k the K
-         */
-         public void setK(double k)
-         {
-            this.k = k;
-            notifyPropertyChanged(BR.k);
-         }
-     
-     
-         /**
-         * Gets the X.
-         *
-         * return the X
-         */
-         @Bindable
-         public double getX()
-         {
-            return x;
-         }
-
-         /**
-         * Sets the X.
-         *
-         * @param x the X
-         */
-         public void setX(double x)
-         {
-            this.x = x;
-            notifyPropertyChanged(BR.x);
-         }
-     
-     
-         /**
-         * Gets the PulsePerMmSpring.
-         *
-         * return the PulsePerMmSpring
-         */
-         @Bindable
-         public int getPulsePerMmSpring()
-         {
-            return pulsePerMmSpring;
-         }
-
-         /**
-         * Sets the PulsePerMmSpring.
-         *
-         * @param pulsePerMmSpring the PulsePerMmSpring
-         */
-         public void setPulsePerMmSpring(int pulsePerMmSpring)
-         {
-            this.pulsePerMmSpring = pulsePerMmSpring;
-            notifyPropertyChanged(BR.pulsePerMmSpring);
-         }
-     
-     
-         /**
-         * Gets the HardwareDancerTypes.
-         *
-         * return the HardwareDancerTypes
-         */
-         @Bindable
-         public HardwareDancerType getHardwareDancerTypes()
-         {
-            return hardwareDancerTypes;
-         }
-
-         /**
-         * Sets the HardwareDancerTypes.
-         *
-         * @param hardwareDancerTypes the HardwareDancerTypes
-         */
-         public void setHardwareDancerTypes(HardwareDancerType hardwareDancerTypes)
-         {
-            this.hardwareDancerTypes = hardwareDancerTypes;
-            notifyPropertyChanged(BR.hardwareDancerTypes);
-         }
-     
-     
-         /**
-         * Gets the HardwareVersions.
-         *
-         * return the HardwareVersions
-         */
-         @Bindable
-         public HardwareVersion getHardwareVersions()
-         {
-            return hardwareVersions;
-         }
-
-         /**
-         * Sets the HardwareVersions.
-         *
-         * @param hardwareVersions the HardwareVersions
-         */
-         public void setHardwareVersions(HardwareVersion hardwareVersions)
-         {
-            this.hardwareVersions = hardwareVersions;
-            notifyPropertyChanged(BR.hardwareVersions);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerBase.java
new file mode 100644
index 000000000..3f756950f
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerBase.java
@@ -0,0 +1,183 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class HardwareDancerBase extends Entity 
+    {
+    
+            @Column(name = "GRADUAL")
+            private boolean gradual;
+
+    
+    
+            @Column(name = "K")
+            private double k;
+
+    
+    
+            @Column(name = "X")
+            private double x;
+
+    
+    
+            @Column(name = "PULSE_PER_MM_SPRING")
+            private int pulsePerMmSpring;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_DANCER_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private HardwareDancerType hardwareDancerType;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
+            private HardwareVersion hardwareVersion;
+
+    
+
+     
+         /**
+         * Gets the Gradual.
+         *
+         * return the Gradual
+         */
+         @Bindable
+         public boolean isGradual()
+         {
+            return gradual;
+         }
+
+         /**
+         * Sets the Gradual.
+         *
+         * @param gradual the Gradual
+         */
+         public void setGradual(boolean gradual)
+         {
+            this.gradual = gradual;
+            notifyPropertyChanged(BR.gradual);
+         }
+     
+     
+         /**
+         * Gets the K.
+         *
+         * return the K
+         */
+         @Bindable
+         public double getK()
+         {
+            return k;
+         }
+
+         /**
+         * Sets the K.
+         *
+         * @param k the K
+         */
+         public void setK(double k)
+         {
+            this.k = k;
+            notifyPropertyChanged(BR.k);
+         }
+     
+     
+         /**
+         * Gets the X.
+         *
+         * return the X
+         */
+         @Bindable
+         public double getX()
+         {
+            return x;
+         }
+
+         /**
+         * Sets the X.
+         *
+         * @param x the X
+         */
+         public void setX(double x)
+         {
+            this.x = x;
+            notifyPropertyChanged(BR.x);
+         }
+     
+     
+         /**
+         * Gets the PulsePerMmSpring.
+         *
+         * return the PulsePerMmSpring
+         */
+         @Bindable
+         public int getPulsePerMmSpring()
+         {
+            return pulsePerMmSpring;
+         }
+
+         /**
+         * Sets the PulsePerMmSpring.
+         *
+         * @param pulsePerMmSpring the PulsePerMmSpring
+         */
+         public void setPulsePerMmSpring(int pulsePerMmSpring)
+         {
+            this.pulsePerMmSpring = pulsePerMmSpring;
+            notifyPropertyChanged(BR.pulsePerMmSpring);
+         }
+     
+     
+         /**
+         * Gets the HardwareDancerType.
+         *
+         * return the HardwareDancerType
+         */
+         @Bindable
+         public HardwareDancerType getHardwareDancerType()
+         {
+            return hardwareDancerType;
+         }
+
+         /**
+         * Sets the HardwareDancerType.
+         *
+         * @param hardwareDancerType the HardwareDancerType
+         */
+         public void setHardwareDancerType(HardwareDancerType hardwareDancerType)
+         {
+            this.hardwareDancerType = hardwareDancerType;
+            notifyPropertyChanged(BR.hardwareDancerType);
+         }
+     
+     
+         /**
+         * Gets the HardwareVersion.
+         *
+         * return the HardwareVersion
+         */
+         @Bindable
+         public HardwareVersion getHardwareVersion()
+         {
+            return hardwareVersion;
+         }
+
+         /**
+         * Sets the HardwareVersion.
+         *
+         * @param hardwareVersion the HardwareVersion
+         */
+         public void setHardwareVersion(HardwareVersion hardwareVersion)
+         {
+            this.hardwareVersion = hardwareVersion;
+            notifyPropertyChanged(BR.hardwareVersion);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java
index 4654fae40..758dc32d3 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerType.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "HARDWARE_DANCER_TYPES", database = TangoDB.class, cachingEnabled = true)
+public class HardwareDancerType extends HardwareDancerTypeBase
+{
 
-    @Table(name = "HARDWARE_DANCER_TYPES", database = TangoDB.class)
-    public class HardwareDancerType extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerTypeBase.java
new file mode 100644
index 000000000..ef92de00e
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareDancerTypeBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class HardwareDancerTypeBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java
index 72b576034..2916aed44 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotor.java
@@ -1,466 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "HARDWARE_MOTORS", database = TangoDB.class, cachingEnabled = true)
+public class HardwareMotor extends HardwareMotorBase
+{
 
-    @Table(name = "HARDWARE_MOTORS", database = TangoDB.class)
-    public class HardwareMotor extends Entity 
-    {
     
-            @Column(name = "MIN_FREQUENCY")
-            private int minFrequency;
-
-    
-    
-            @Column(name = "MAX_FREQUENCY")
-            private int maxFrequency;
-
-    
-    
-            @Column(name = "MIN_MICRO_STEP")
-            private int minMicroStep;
-
-    
-    
-            @Column(name = "MAX_MICRO_STEP")
-            private int maxMicroStep;
-
-    
-    
-            @Column(name = "LINEAR_RATIO")
-            private double linearRatio;
-
-    
-    
-            @Column(name = "MEDIAN_POSITION")
-            private int medianPosition;
-
-    
-    
-            @Column(name = "CORRECTION_GAIN")
-            private double correctionGain;
-
-    
-    
-            @Column(name = "RATIO_TO_DRYER_SPEED")
-            private double ratioToDryerSpeed;
-
-    
-    
-            @Column(name = "KP")
-            private double kp;
-
-    
-    
-            @Column(name = "KI")
-            private double ki;
-
-    
-    
-            @Column(name = "KD")
-            private double kd;
-
-    
-    
-            @Column(name = "CHANGE_SLOPE")
-            private double changeSlope;
-
-    
-    
-            @Column(name = "HIGH_LENGTH_MICRO_SECOND")
-            private double highLengthMicroSecond;
-
-    
-    
-            @Column(name = "SPEED_MASTER")
-            private boolean speedMaster;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_MOTOR_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareMotorType hardwareMotorTypes;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSIONS_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareVersion hardwareVersions;
-
-    
-
-     
-         /**
-         * Gets the MinFrequency.
-         *
-         * return the MinFrequency
-         */
-         @Bindable
-         public int getMinFrequency()
-         {
-            return minFrequency;
-         }
-
-         /**
-         * Sets the MinFrequency.
-         *
-         * @param minFrequency the MinFrequency
-         */
-         public void setMinFrequency(int minFrequency)
-         {
-            this.minFrequency = minFrequency;
-            notifyPropertyChanged(BR.minFrequency);
-         }
-     
-     
-         /**
-         * Gets the MaxFrequency.
-         *
-         * return the MaxFrequency
-         */
-         @Bindable
-         public int getMaxFrequency()
-         {
-            return maxFrequency;
-         }
-
-         /**
-         * Sets the MaxFrequency.
-         *
-         * @param maxFrequency the MaxFrequency
-         */
-         public void setMaxFrequency(int maxFrequency)
-         {
-            this.maxFrequency = maxFrequency;
-            notifyPropertyChanged(BR.maxFrequency);
-         }
-     
-     
-         /**
-         * Gets the MinMicroStep.
-         *
-         * return the MinMicroStep
-         */
-         @Bindable
-         public int getMinMicroStep()
-         {
-            return minMicroStep;
-         }
-
-         /**
-         * Sets the MinMicroStep.
-         *
-         * @param minMicroStep the MinMicroStep
-         */
-         public void setMinMicroStep(int minMicroStep)
-         {
-            this.minMicroStep = minMicroStep;
-            notifyPropertyChanged(BR.minMicroStep);
-         }
-     
-     
-         /**
-         * Gets the MaxMicroStep.
-         *
-         * return the MaxMicroStep
-         */
-         @Bindable
-         public int getMaxMicroStep()
-         {
-            return maxMicroStep;
-         }
-
-         /**
-         * Sets the MaxMicroStep.
-         *
-         * @param maxMicroStep the MaxMicroStep
-         */
-         public void setMaxMicroStep(int maxMicroStep)
-         {
-            this.maxMicroStep = maxMicroStep;
-            notifyPropertyChanged(BR.maxMicroStep);
-         }
-     
-     
-         /**
-         * Gets the LinearRatio.
-         *
-         * return the LinearRatio
-         */
-         @Bindable
-         public double getLinearRatio()
-         {
-            return linearRatio;
-         }
-
-         /**
-         * Sets the LinearRatio.
-         *
-         * @param linearRatio the LinearRatio
-         */
-         public void setLinearRatio(double linearRatio)
-         {
-            this.linearRatio = linearRatio;
-            notifyPropertyChanged(BR.linearRatio);
-         }
-     
-     
-         /**
-         * Gets the MedianPosition.
-         *
-         * return the MedianPosition
-         */
-         @Bindable
-         public int getMedianPosition()
-         {
-            return medianPosition;
-         }
-
-         /**
-         * Sets the MedianPosition.
-         *
-         * @param medianPosition the MedianPosition
-         */
-         public void setMedianPosition(int medianPosition)
-         {
-            this.medianPosition = medianPosition;
-            notifyPropertyChanged(BR.medianPosition);
-         }
-     
-     
-         /**
-         * Gets the CorrectionGain.
-         *
-         * return the CorrectionGain
-         */
-         @Bindable
-         public double getCorrectionGain()
-         {
-            return correctionGain;
-         }
-
-         /**
-         * Sets the CorrectionGain.
-         *
-         * @param correctionGain the CorrectionGain
-         */
-         public void setCorrectionGain(double correctionGain)
-         {
-            this.correctionGain = correctionGain;
-            notifyPropertyChanged(BR.correctionGain);
-         }
-     
-     
-         /**
-         * Gets the RatioToDryerSpeed.
-         *
-         * return the RatioToDryerSpeed
-         */
-         @Bindable
-         public double getRatioToDryerSpeed()
-         {
-            return ratioToDryerSpeed;
-         }
-
-         /**
-         * Sets the RatioToDryerSpeed.
-         *
-         * @param ratioToDryerSpeed the RatioToDryerSpeed
-         */
-         public void setRatioToDryerSpeed(double ratioToDryerSpeed)
-         {
-            this.ratioToDryerSpeed = ratioToDryerSpeed;
-            notifyPropertyChanged(BR.ratioToDryerSpeed);
-         }
-     
-     
-         /**
-         * Gets the Kp.
-         *
-         * return the Kp
-         */
-         @Bindable
-         public double getKp()
-         {
-            return kp;
-         }
-
-         /**
-         * Sets the Kp.
-         *
-         * @param kp the Kp
-         */
-         public void setKp(double kp)
-         {
-            this.kp = kp;
-            notifyPropertyChanged(BR.kp);
-         }
-     
-     
-         /**
-         * Gets the Ki.
-         *
-         * return the Ki
-         */
-         @Bindable
-         public double getKi()
-         {
-            return ki;
-         }
-
-         /**
-         * Sets the Ki.
-         *
-         * @param ki the Ki
-         */
-         public void setKi(double ki)
-         {
-            this.ki = ki;
-            notifyPropertyChanged(BR.ki);
-         }
-     
-     
-         /**
-         * Gets the Kd.
-         *
-         * return the Kd
-         */
-         @Bindable
-         public double getKd()
-         {
-            return kd;
-         }
-
-         /**
-         * Sets the Kd.
-         *
-         * @param kd the Kd
-         */
-         public void setKd(double kd)
-         {
-            this.kd = kd;
-            notifyPropertyChanged(BR.kd);
-         }
-     
-     
-         /**
-         * Gets the ChangeSlope.
-         *
-         * return the ChangeSlope
-         */
-         @Bindable
-         public double getChangeSlope()
-         {
-            return changeSlope;
-         }
-
-         /**
-         * Sets the ChangeSlope.
-         *
-         * @param changeSlope the ChangeSlope
-         */
-         public void setChangeSlope(double changeSlope)
-         {
-            this.changeSlope = changeSlope;
-            notifyPropertyChanged(BR.changeSlope);
-         }
-     
-     
-         /**
-         * Gets the HighLengthMicroSecond.
-         *
-         * return the HighLengthMicroSecond
-         */
-         @Bindable
-         public double getHighLengthMicroSecond()
-         {
-            return highLengthMicroSecond;
-         }
-
-         /**
-         * Sets the HighLengthMicroSecond.
-         *
-         * @param highLengthMicroSecond the HighLengthMicroSecond
-         */
-         public void setHighLengthMicroSecond(double highLengthMicroSecond)
-         {
-            this.highLengthMicroSecond = highLengthMicroSecond;
-            notifyPropertyChanged(BR.highLengthMicroSecond);
-         }
-     
-     
-         /**
-         * Gets the SpeedMaster.
-         *
-         * return the SpeedMaster
-         */
-         @Bindable
-         public boolean isSpeedMaster()
-         {
-            return speedMaster;
-         }
-
-         /**
-         * Sets the SpeedMaster.
-         *
-         * @param speedMaster the SpeedMaster
-         */
-         public void setSpeedMaster(boolean speedMaster)
-         {
-            this.speedMaster = speedMaster;
-            notifyPropertyChanged(BR.speedMaster);
-         }
-     
-     
-         /**
-         * Gets the HardwareMotorTypes.
-         *
-         * return the HardwareMotorTypes
-         */
-         @Bindable
-         public HardwareMotorType getHardwareMotorTypes()
-         {
-            return hardwareMotorTypes;
-         }
-
-         /**
-         * Sets the HardwareMotorTypes.
-         *
-         * @param hardwareMotorTypes the HardwareMotorTypes
-         */
-         public void setHardwareMotorTypes(HardwareMotorType hardwareMotorTypes)
-         {
-            this.hardwareMotorTypes = hardwareMotorTypes;
-            notifyPropertyChanged(BR.hardwareMotorTypes);
-         }
-     
-     
-         /**
-         * Gets the HardwareVersions.
-         *
-         * return the HardwareVersions
-         */
-         @Bindable
-         public HardwareVersion getHardwareVersions()
-         {
-            return hardwareVersions;
-         }
-
-         /**
-         * Sets the HardwareVersions.
-         *
-         * @param hardwareVersions the HardwareVersions
-         */
-         public void setHardwareVersions(HardwareVersion hardwareVersions)
-         {
-            this.hardwareVersions = hardwareVersions;
-            notifyPropertyChanged(BR.hardwareVersions);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorBase.java
new file mode 100644
index 000000000..86f26b9c1
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorBase.java
@@ -0,0 +1,463 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class HardwareMotorBase extends Entity 
+    {
+    
+            @Column(name = "MIN_FREQUENCY")
+            private int minFrequency;
+
+    
+    
+            @Column(name = "MAX_FREQUENCY")
+            private int maxFrequency;
+
+    
+    
+            @Column(name = "MIN_MICRO_STEP")
+            private int minMicroStep;
+
+    
+    
+            @Column(name = "MAX_MICRO_STEP")
+            private int maxMicroStep;
+
+    
+    
+            @Column(name = "LINEAR_RATIO")
+            private double linearRatio;
+
+    
+    
+            @Column(name = "MEDIAN_POSITION")
+            private int medianPosition;
+
+    
+    
+            @Column(name = "CORRECTION_GAIN")
+            private double correctionGain;
+
+    
+    
+            @Column(name = "RATIO_TO_DRYER_SPEED")
+            private double ratioToDryerSpeed;
+
+    
+    
+            @Column(name = "KP")
+            private double kp;
+
+    
+    
+            @Column(name = "KI")
+            private double ki;
+
+    
+    
+            @Column(name = "KD")
+            private double kd;
+
+    
+    
+            @Column(name = "CHANGE_SLOPE")
+            private double changeSlope;
+
+    
+    
+            @Column(name = "HIGH_LENGTH_MICRO_SECOND")
+            private double highLengthMicroSecond;
+
+    
+    
+            @Column(name = "SPEED_MASTER")
+            private boolean speedMaster;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_MOTOR_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private HardwareMotorType hardwareMotorType;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
+            private HardwareVersion hardwareVersion;
+
+    
+
+     
+         /**
+         * Gets the MinFrequency.
+         *
+         * return the MinFrequency
+         */
+         @Bindable
+         public int getMinFrequency()
+         {
+            return minFrequency;
+         }
+
+         /**
+         * Sets the MinFrequency.
+         *
+         * @param minFrequency the MinFrequency
+         */
+         public void setMinFrequency(int minFrequency)
+         {
+            this.minFrequency = minFrequency;
+            notifyPropertyChanged(BR.minFrequency);
+         }
+     
+     
+         /**
+         * Gets the MaxFrequency.
+         *
+         * return the MaxFrequency
+         */
+         @Bindable
+         public int getMaxFrequency()
+         {
+            return maxFrequency;
+         }
+
+         /**
+         * Sets the MaxFrequency.
+         *
+         * @param maxFrequency the MaxFrequency
+         */
+         public void setMaxFrequency(int maxFrequency)
+         {
+            this.maxFrequency = maxFrequency;
+            notifyPropertyChanged(BR.maxFrequency);
+         }
+     
+     
+         /**
+         * Gets the MinMicroStep.
+         *
+         * return the MinMicroStep
+         */
+         @Bindable
+         public int getMinMicroStep()
+         {
+            return minMicroStep;
+         }
+
+         /**
+         * Sets the MinMicroStep.
+         *
+         * @param minMicroStep the MinMicroStep
+         */
+         public void setMinMicroStep(int minMicroStep)
+         {
+            this.minMicroStep = minMicroStep;
+            notifyPropertyChanged(BR.minMicroStep);
+         }
+     
+     
+         /**
+         * Gets the MaxMicroStep.
+         *
+         * return the MaxMicroStep
+         */
+         @Bindable
+         public int getMaxMicroStep()
+         {
+            return maxMicroStep;
+         }
+
+         /**
+         * Sets the MaxMicroStep.
+         *
+         * @param maxMicroStep the MaxMicroStep
+         */
+         public void setMaxMicroStep(int maxMicroStep)
+         {
+            this.maxMicroStep = maxMicroStep;
+            notifyPropertyChanged(BR.maxMicroStep);
+         }
+     
+     
+         /**
+         * Gets the LinearRatio.
+         *
+         * return the LinearRatio
+         */
+         @Bindable
+         public double getLinearRatio()
+         {
+            return linearRatio;
+         }
+
+         /**
+         * Sets the LinearRatio.
+         *
+         * @param linearRatio the LinearRatio
+         */
+         public void setLinearRatio(double linearRatio)
+         {
+            this.linearRatio = linearRatio;
+            notifyPropertyChanged(BR.linearRatio);
+         }
+     
+     
+         /**
+         * Gets the MedianPosition.
+         *
+         * return the MedianPosition
+         */
+         @Bindable
+         public int getMedianPosition()
+         {
+            return medianPosition;
+         }
+
+         /**
+         * Sets the MedianPosition.
+         *
+         * @param medianPosition the MedianPosition
+         */
+         public void setMedianPosition(int medianPosition)
+         {
+            this.medianPosition = medianPosition;
+            notifyPropertyChanged(BR.medianPosition);
+         }
+     
+     
+         /**
+         * Gets the CorrectionGain.
+         *
+         * return the CorrectionGain
+         */
+         @Bindable
+         public double getCorrectionGain()
+         {
+            return correctionGain;
+         }
+
+         /**
+         * Sets the CorrectionGain.
+         *
+         * @param correctionGain the CorrectionGain
+         */
+         public void setCorrectionGain(double correctionGain)
+         {
+            this.correctionGain = correctionGain;
+            notifyPropertyChanged(BR.correctionGain);
+         }
+     
+     
+         /**
+         * Gets the RatioToDryerSpeed.
+         *
+         * return the RatioToDryerSpeed
+         */
+         @Bindable
+         public double getRatioToDryerSpeed()
+         {
+            return ratioToDryerSpeed;
+         }
+
+         /**
+         * Sets the RatioToDryerSpeed.
+         *
+         * @param ratioToDryerSpeed the RatioToDryerSpeed
+         */
+         public void setRatioToDryerSpeed(double ratioToDryerSpeed)
+         {
+            this.ratioToDryerSpeed = ratioToDryerSpeed;
+            notifyPropertyChanged(BR.ratioToDryerSpeed);
+         }
+     
+     
+         /**
+         * Gets the Kp.
+         *
+         * return the Kp
+         */
+         @Bindable
+         public double getKp()
+         {
+            return kp;
+         }
+
+         /**
+         * Sets the Kp.
+         *
+         * @param kp the Kp
+         */
+         public void setKp(double kp)
+         {
+            this.kp = kp;
+            notifyPropertyChanged(BR.kp);
+         }
+     
+     
+         /**
+         * Gets the Ki.
+         *
+         * return the Ki
+         */
+         @Bindable
+         public double getKi()
+         {
+            return ki;
+         }
+
+         /**
+         * Sets the Ki.
+         *
+         * @param ki the Ki
+         */
+         public void setKi(double ki)
+         {
+            this.ki = ki;
+            notifyPropertyChanged(BR.ki);
+         }
+     
+     
+         /**
+         * Gets the Kd.
+         *
+         * return the Kd
+         */
+         @Bindable
+         public double getKd()
+         {
+            return kd;
+         }
+
+         /**
+         * Sets the Kd.
+         *
+         * @param kd the Kd
+         */
+         public void setKd(double kd)
+         {
+            this.kd = kd;
+            notifyPropertyChanged(BR.kd);
+         }
+     
+     
+         /**
+         * Gets the ChangeSlope.
+         *
+         * return the ChangeSlope
+         */
+         @Bindable
+         public double getChangeSlope()
+         {
+            return changeSlope;
+         }
+
+         /**
+         * Sets the ChangeSlope.
+         *
+         * @param changeSlope the ChangeSlope
+         */
+         public void setChangeSlope(double changeSlope)
+         {
+            this.changeSlope = changeSlope;
+            notifyPropertyChanged(BR.changeSlope);
+         }
+     
+     
+         /**
+         * Gets the HighLengthMicroSecond.
+         *
+         * return the HighLengthMicroSecond
+         */
+         @Bindable
+         public double getHighLengthMicroSecond()
+         {
+            return highLengthMicroSecond;
+         }
+
+         /**
+         * Sets the HighLengthMicroSecond.
+         *
+         * @param highLengthMicroSecond the HighLengthMicroSecond
+         */
+         public void setHighLengthMicroSecond(double highLengthMicroSecond)
+         {
+            this.highLengthMicroSecond = highLengthMicroSecond;
+            notifyPropertyChanged(BR.highLengthMicroSecond);
+         }
+     
+     
+         /**
+         * Gets the SpeedMaster.
+         *
+         * return the SpeedMaster
+         */
+         @Bindable
+         public boolean isSpeedMaster()
+         {
+            return speedMaster;
+         }
+
+         /**
+         * Sets the SpeedMaster.
+         *
+         * @param speedMaster the SpeedMaster
+         */
+         public void setSpeedMaster(boolean speedMaster)
+         {
+            this.speedMaster = speedMaster;
+            notifyPropertyChanged(BR.speedMaster);
+         }
+     
+     
+         /**
+         * Gets the HardwareMotorType.
+         *
+         * return the HardwareMotorType
+         */
+         @Bindable
+         public HardwareMotorType getHardwareMotorType()
+         {
+            return hardwareMotorType;
+         }
+
+         /**
+         * Sets the HardwareMotorType.
+         *
+         * @param hardwareMotorType the HardwareMotorType
+         */
+         public void setHardwareMotorType(HardwareMotorType hardwareMotorType)
+         {
+            this.hardwareMotorType = hardwareMotorType;
+            notifyPropertyChanged(BR.hardwareMotorType);
+         }
+     
+     
+         /**
+         * Gets the HardwareVersion.
+         *
+         * return the HardwareVersion
+         */
+         @Bindable
+         public HardwareVersion getHardwareVersion()
+         {
+            return hardwareVersion;
+         }
+
+         /**
+         * Sets the HardwareVersion.
+         *
+         * @param hardwareVersion the HardwareVersion
+         */
+         public void setHardwareVersion(HardwareVersion hardwareVersion)
+         {
+            this.hardwareVersion = hardwareVersion;
+            notifyPropertyChanged(BR.hardwareVersion);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java
index 80674e6fa..1e1a725de 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorType.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "HARDWARE_MOTOR_TYPES", database = TangoDB.class, cachingEnabled = true)
+public class HardwareMotorType extends HardwareMotorTypeBase
+{
 
-    @Table(name = "HARDWARE_MOTOR_TYPES", database = TangoDB.class)
-    public class HardwareMotorType extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorTypeBase.java
new file mode 100644
index 000000000..38a0835fe
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareMotorTypeBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class HardwareMotorTypeBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java
index ec2506b57..63bc62fdf 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControl.java
@@ -1,466 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "HARDWARE_PID_CONTROLS", database = TangoDB.class, cachingEnabled = true)
+public class HardwarePidControl extends HardwarePidControlBase
+{
 
-    @Table(name = "HARDWARE_PID_CONTROLS", database = TangoDB.class)
-    public class HardwarePidControl extends Entity 
-    {
     
-            @Column(name = "OUTPUT_PROPORTIONAL_POWER_LIMIT")
-            private int outputProportionalPowerLimit;
-
-    
-    
-            @Column(name = "OUTPUT_PROPORTIONAL_BAND")
-            private int outputProportionalBand;
-
-    
-    
-            @Column(name = "INTEGRAL_TIME")
-            private int integralTime;
-
-    
-    
-            @Column(name = "DERIVATIVE_TIME")
-            private int derivativeTime;
-
-    
-    
-            @Column(name = "SENSOR_CORRECTION_ADJUSTMENT")
-            private int sensorCorrectionAdjustment;
-
-    
-    
-            @Column(name = "SENSOR_MIN_VALUE")
-            private int sensorMinValue;
-
-    
-    
-            @Column(name = "SENSOR_MAX_VALUE")
-            private int sensorMaxValue;
-
-    
-    
-            @Column(name = "SET_POINT_RAMP_RATEOR_SOFT_START_RAMP")
-            private int pointRampRateorSoftStartRamp;
-
-    
-    
-            @Column(name = "SET_POINT_CONTROL_OUTPUT_RATE")
-            private int pointControlOutputRate;
-
-    
-    
-            @Column(name = "CONTROL_OUTPUT_TYPE")
-            private int controlOutputType;
-
-    
-    
-            @Column(name = "SSR_CONTROL_OUTPUT_TYPE")
-            private int ssrControlOutputType;
-
-    
-    
-            @Column(name = "OUTPUT_ON_OFF_HYSTERESIS_VALUE")
-            private int outputOnOffHysteresisValue;
-
-    
-    
-            @Column(name = "PROCESS_VARIABLE_SAMPLING_RATE")
-            private int processVariableSamplingRate;
-
-    
-    
-            @Column(name = "PV_INPUT_FILTER_FACTOR_MODE")
-            private int pvInputFilterFactorMode;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_PID_CONTROL_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private HardwarePidControlType hardwarePidControlTypes;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSIONS_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareVersion hardwareVersions;
-
-    
-
-     
-         /**
-         * Gets the OutputProportionalPowerLimit.
-         *
-         * return the OutputProportionalPowerLimit
-         */
-         @Bindable
-         public int getOutputProportionalPowerLimit()
-         {
-            return outputProportionalPowerLimit;
-         }
-
-         /**
-         * Sets the OutputProportionalPowerLimit.
-         *
-         * @param outputProportionalPowerLimit the OutputProportionalPowerLimit
-         */
-         public void setOutputProportionalPowerLimit(int outputProportionalPowerLimit)
-         {
-            this.outputProportionalPowerLimit = outputProportionalPowerLimit;
-            notifyPropertyChanged(BR.outputProportionalPowerLimit);
-         }
-     
-     
-         /**
-         * Gets the OutputProportionalBand.
-         *
-         * return the OutputProportionalBand
-         */
-         @Bindable
-         public int getOutputProportionalBand()
-         {
-            return outputProportionalBand;
-         }
-
-         /**
-         * Sets the OutputProportionalBand.
-         *
-         * @param outputProportionalBand the OutputProportionalBand
-         */
-         public void setOutputProportionalBand(int outputProportionalBand)
-         {
-            this.outputProportionalBand = outputProportionalBand;
-            notifyPropertyChanged(BR.outputProportionalBand);
-         }
-     
-     
-         /**
-         * Gets the IntegralTime.
-         *
-         * return the IntegralTime
-         */
-         @Bindable
-         public int getIntegralTime()
-         {
-            return integralTime;
-         }
-
-         /**
-         * Sets the IntegralTime.
-         *
-         * @param integralTime the IntegralTime
-         */
-         public void setIntegralTime(int integralTime)
-         {
-            this.integralTime = integralTime;
-            notifyPropertyChanged(BR.integralTime);
-         }
-     
-     
-         /**
-         * Gets the DerivativeTime.
-         *
-         * return the DerivativeTime
-         */
-         @Bindable
-         public int getDerivativeTime()
-         {
-            return derivativeTime;
-         }
-
-         /**
-         * Sets the DerivativeTime.
-         *
-         * @param derivativeTime the DerivativeTime
-         */
-         public void setDerivativeTime(int derivativeTime)
-         {
-            this.derivativeTime = derivativeTime;
-            notifyPropertyChanged(BR.derivativeTime);
-         }
-     
-     
-         /**
-         * Gets the SensorCorrectionAdjustment.
-         *
-         * return the SensorCorrectionAdjustment
-         */
-         @Bindable
-         public int getSensorCorrectionAdjustment()
-         {
-            return sensorCorrectionAdjustment;
-         }
-
-         /**
-         * Sets the SensorCorrectionAdjustment.
-         *
-         * @param sensorCorrectionAdjustment the SensorCorrectionAdjustment
-         */
-         public void setSensorCorrectionAdjustment(int sensorCorrectionAdjustment)
-         {
-            this.sensorCorrectionAdjustment = sensorCorrectionAdjustment;
-            notifyPropertyChanged(BR.sensorCorrectionAdjustment);
-         }
-     
-     
-         /**
-         * Gets the SensorMinValue.
-         *
-         * return the SensorMinValue
-         */
-         @Bindable
-         public int getSensorMinValue()
-         {
-            return sensorMinValue;
-         }
-
-         /**
-         * Sets the SensorMinValue.
-         *
-         * @param sensorMinValue the SensorMinValue
-         */
-         public void setSensorMinValue(int sensorMinValue)
-         {
-            this.sensorMinValue = sensorMinValue;
-            notifyPropertyChanged(BR.sensorMinValue);
-         }
-     
-     
-         /**
-         * Gets the SensorMaxValue.
-         *
-         * return the SensorMaxValue
-         */
-         @Bindable
-         public int getSensorMaxValue()
-         {
-            return sensorMaxValue;
-         }
-
-         /**
-         * Sets the SensorMaxValue.
-         *
-         * @param sensorMaxValue the SensorMaxValue
-         */
-         public void setSensorMaxValue(int sensorMaxValue)
-         {
-            this.sensorMaxValue = sensorMaxValue;
-            notifyPropertyChanged(BR.sensorMaxValue);
-         }
-     
-     
-         /**
-         * Gets the PointRampRateorSoftStartRamp.
-         *
-         * return the PointRampRateorSoftStartRamp
-         */
-         @Bindable
-         public int getPointRampRateorSoftStartRamp()
-         {
-            return pointRampRateorSoftStartRamp;
-         }
-
-         /**
-         * Sets the PointRampRateorSoftStartRamp.
-         *
-         * @param pointRampRateorSoftStartRamp the PointRampRateorSoftStartRamp
-         */
-         public void setPointRampRateorSoftStartRamp(int pointRampRateorSoftStartRamp)
-         {
-            this.pointRampRateorSoftStartRamp = pointRampRateorSoftStartRamp;
-            notifyPropertyChanged(BR.pointRampRateorSoftStartRamp);
-         }
-     
-     
-         /**
-         * Gets the PointControlOutputRate.
-         *
-         * return the PointControlOutputRate
-         */
-         @Bindable
-         public int getPointControlOutputRate()
-         {
-            return pointControlOutputRate;
-         }
-
-         /**
-         * Sets the PointControlOutputRate.
-         *
-         * @param pointControlOutputRate the PointControlOutputRate
-         */
-         public void setPointControlOutputRate(int pointControlOutputRate)
-         {
-            this.pointControlOutputRate = pointControlOutputRate;
-            notifyPropertyChanged(BR.pointControlOutputRate);
-         }
-     
-     
-         /**
-         * Gets the ControlOutputType.
-         *
-         * return the ControlOutputType
-         */
-         @Bindable
-         public int getControlOutputType()
-         {
-            return controlOutputType;
-         }
-
-         /**
-         * Sets the ControlOutputType.
-         *
-         * @param controlOutputType the ControlOutputType
-         */
-         public void setControlOutputType(int controlOutputType)
-         {
-            this.controlOutputType = controlOutputType;
-            notifyPropertyChanged(BR.controlOutputType);
-         }
-     
-     
-         /**
-         * Gets the SsrControlOutputType.
-         *
-         * return the SsrControlOutputType
-         */
-         @Bindable
-         public int getSsrControlOutputType()
-         {
-            return ssrControlOutputType;
-         }
-
-         /**
-         * Sets the SsrControlOutputType.
-         *
-         * @param ssrControlOutputType the SsrControlOutputType
-         */
-         public void setSsrControlOutputType(int ssrControlOutputType)
-         {
-            this.ssrControlOutputType = ssrControlOutputType;
-            notifyPropertyChanged(BR.ssrControlOutputType);
-         }
-     
-     
-         /**
-         * Gets the OutputOnOffHysteresisValue.
-         *
-         * return the OutputOnOffHysteresisValue
-         */
-         @Bindable
-         public int getOutputOnOffHysteresisValue()
-         {
-            return outputOnOffHysteresisValue;
-         }
-
-         /**
-         * Sets the OutputOnOffHysteresisValue.
-         *
-         * @param outputOnOffHysteresisValue the OutputOnOffHysteresisValue
-         */
-         public void setOutputOnOffHysteresisValue(int outputOnOffHysteresisValue)
-         {
-            this.outputOnOffHysteresisValue = outputOnOffHysteresisValue;
-            notifyPropertyChanged(BR.outputOnOffHysteresisValue);
-         }
-     
-     
-         /**
-         * Gets the ProcessVariableSamplingRate.
-         *
-         * return the ProcessVariableSamplingRate
-         */
-         @Bindable
-         public int getProcessVariableSamplingRate()
-         {
-            return processVariableSamplingRate;
-         }
-
-         /**
-         * Sets the ProcessVariableSamplingRate.
-         *
-         * @param processVariableSamplingRate the ProcessVariableSamplingRate
-         */
-         public void setProcessVariableSamplingRate(int processVariableSamplingRate)
-         {
-            this.processVariableSamplingRate = processVariableSamplingRate;
-            notifyPropertyChanged(BR.processVariableSamplingRate);
-         }
-     
-     
-         /**
-         * Gets the PvInputFilterFactorMode.
-         *
-         * return the PvInputFilterFactorMode
-         */
-         @Bindable
-         public int getPvInputFilterFactorMode()
-         {
-            return pvInputFilterFactorMode;
-         }
-
-         /**
-         * Sets the PvInputFilterFactorMode.
-         *
-         * @param pvInputFilterFactorMode the PvInputFilterFactorMode
-         */
-         public void setPvInputFilterFactorMode(int pvInputFilterFactorMode)
-         {
-            this.pvInputFilterFactorMode = pvInputFilterFactorMode;
-            notifyPropertyChanged(BR.pvInputFilterFactorMode);
-         }
-     
-     
-         /**
-         * Gets the HardwarePidControlTypes.
-         *
-         * return the HardwarePidControlTypes
-         */
-         @Bindable
-         public HardwarePidControlType getHardwarePidControlTypes()
-         {
-            return hardwarePidControlTypes;
-         }
-
-         /**
-         * Sets the HardwarePidControlTypes.
-         *
-         * @param hardwarePidControlTypes the HardwarePidControlTypes
-         */
-         public void setHardwarePidControlTypes(HardwarePidControlType hardwarePidControlTypes)
-         {
-            this.hardwarePidControlTypes = hardwarePidControlTypes;
-            notifyPropertyChanged(BR.hardwarePidControlTypes);
-         }
-     
-     
-         /**
-         * Gets the HardwareVersions.
-         *
-         * return the HardwareVersions
-         */
-         @Bindable
-         public HardwareVersion getHardwareVersions()
-         {
-            return hardwareVersions;
-         }
-
-         /**
-         * Sets the HardwareVersions.
-         *
-         * @param hardwareVersions the HardwareVersions
-         */
-         public void setHardwareVersions(HardwareVersion hardwareVersions)
-         {
-            this.hardwareVersions = hardwareVersions;
-            notifyPropertyChanged(BR.hardwareVersions);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlBase.java
new file mode 100644
index 000000000..a350f51f7
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlBase.java
@@ -0,0 +1,463 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class HardwarePidControlBase extends Entity 
+    {
+    
+            @Column(name = "OUTPUT_PROPORTIONAL_POWER_LIMIT")
+            private int outputProportionalPowerLimit;
+
+    
+    
+            @Column(name = "OUTPUT_PROPORTIONAL_BAND")
+            private int outputProportionalBand;
+
+    
+    
+            @Column(name = "INTEGRAL_TIME")
+            private int integralTime;
+
+    
+    
+            @Column(name = "DERIVATIVE_TIME")
+            private int derivativeTime;
+
+    
+    
+            @Column(name = "SENSOR_CORRECTION_ADJUSTMENT")
+            private int sensorCorrectionAdjustment;
+
+    
+    
+            @Column(name = "SENSOR_MIN_VALUE")
+            private int sensorMinValue;
+
+    
+    
+            @Column(name = "SENSOR_MAX_VALUE")
+            private int sensorMaxValue;
+
+    
+    
+            @Column(name = "SET_POINT_RAMP_RATEOR_SOFT_START_RAMP")
+            private int pointRampRateorSoftStartRamp;
+
+    
+    
+            @Column(name = "SET_POINT_CONTROL_OUTPUT_RATE")
+            private int pointControlOutputRate;
+
+    
+    
+            @Column(name = "CONTROL_OUTPUT_TYPE")
+            private int controlOutputType;
+
+    
+    
+            @Column(name = "SSR_CONTROL_OUTPUT_TYPE")
+            private int ssrControlOutputType;
+
+    
+    
+            @Column(name = "OUTPUT_ON_OFF_HYSTERESIS_VALUE")
+            private int outputOnOffHysteresisValue;
+
+    
+    
+            @Column(name = "PROCESS_VARIABLE_SAMPLING_RATE")
+            private int processVariableSamplingRate;
+
+    
+    
+            @Column(name = "PV_INPUT_FILTER_FACTOR_MODE")
+            private int pvInputFilterFactorMode;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_PID_CONTROL_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private HardwarePidControlType hardwarePidControlType;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
+            private HardwareVersion hardwareVersion;
+
+    
+
+     
+         /**
+         * Gets the OutputProportionalPowerLimit.
+         *
+         * return the OutputProportionalPowerLimit
+         */
+         @Bindable
+         public int getOutputProportionalPowerLimit()
+         {
+            return outputProportionalPowerLimit;
+         }
+
+         /**
+         * Sets the OutputProportionalPowerLimit.
+         *
+         * @param outputProportionalPowerLimit the OutputProportionalPowerLimit
+         */
+         public void setOutputProportionalPowerLimit(int outputProportionalPowerLimit)
+         {
+            this.outputProportionalPowerLimit = outputProportionalPowerLimit;
+            notifyPropertyChanged(BR.outputProportionalPowerLimit);
+         }
+     
+     
+         /**
+         * Gets the OutputProportionalBand.
+         *
+         * return the OutputProportionalBand
+         */
+         @Bindable
+         public int getOutputProportionalBand()
+         {
+            return outputProportionalBand;
+         }
+
+         /**
+         * Sets the OutputProportionalBand.
+         *
+         * @param outputProportionalBand the OutputProportionalBand
+         */
+         public void setOutputProportionalBand(int outputProportionalBand)
+         {
+            this.outputProportionalBand = outputProportionalBand;
+            notifyPropertyChanged(BR.outputProportionalBand);
+         }
+     
+     
+         /**
+         * Gets the IntegralTime.
+         *
+         * return the IntegralTime
+         */
+         @Bindable
+         public int getIntegralTime()
+         {
+            return integralTime;
+         }
+
+         /**
+         * Sets the IntegralTime.
+         *
+         * @param integralTime the IntegralTime
+         */
+         public void setIntegralTime(int integralTime)
+         {
+            this.integralTime = integralTime;
+            notifyPropertyChanged(BR.integralTime);
+         }
+     
+     
+         /**
+         * Gets the DerivativeTime.
+         *
+         * return the DerivativeTime
+         */
+         @Bindable
+         public int getDerivativeTime()
+         {
+            return derivativeTime;
+         }
+
+         /**
+         * Sets the DerivativeTime.
+         *
+         * @param derivativeTime the DerivativeTime
+         */
+         public void setDerivativeTime(int derivativeTime)
+         {
+            this.derivativeTime = derivativeTime;
+            notifyPropertyChanged(BR.derivativeTime);
+         }
+     
+     
+         /**
+         * Gets the SensorCorrectionAdjustment.
+         *
+         * return the SensorCorrectionAdjustment
+         */
+         @Bindable
+         public int getSensorCorrectionAdjustment()
+         {
+            return sensorCorrectionAdjustment;
+         }
+
+         /**
+         * Sets the SensorCorrectionAdjustment.
+         *
+         * @param sensorCorrectionAdjustment the SensorCorrectionAdjustment
+         */
+         public void setSensorCorrectionAdjustment(int sensorCorrectionAdjustment)
+         {
+            this.sensorCorrectionAdjustment = sensorCorrectionAdjustment;
+            notifyPropertyChanged(BR.sensorCorrectionAdjustment);
+         }
+     
+     
+         /**
+         * Gets the SensorMinValue.
+         *
+         * return the SensorMinValue
+         */
+         @Bindable
+         public int getSensorMinValue()
+         {
+            return sensorMinValue;
+         }
+
+         /**
+         * Sets the SensorMinValue.
+         *
+         * @param sensorMinValue the SensorMinValue
+         */
+         public void setSensorMinValue(int sensorMinValue)
+         {
+            this.sensorMinValue = sensorMinValue;
+            notifyPropertyChanged(BR.sensorMinValue);
+         }
+     
+     
+         /**
+         * Gets the SensorMaxValue.
+         *
+         * return the SensorMaxValue
+         */
+         @Bindable
+         public int getSensorMaxValue()
+         {
+            return sensorMaxValue;
+         }
+
+         /**
+         * Sets the SensorMaxValue.
+         *
+         * @param sensorMaxValue the SensorMaxValue
+         */
+         public void setSensorMaxValue(int sensorMaxValue)
+         {
+            this.sensorMaxValue = sensorMaxValue;
+            notifyPropertyChanged(BR.sensorMaxValue);
+         }
+     
+     
+         /**
+         * Gets the PointRampRateorSoftStartRamp.
+         *
+         * return the PointRampRateorSoftStartRamp
+         */
+         @Bindable
+         public int getPointRampRateorSoftStartRamp()
+         {
+            return pointRampRateorSoftStartRamp;
+         }
+
+         /**
+         * Sets the PointRampRateorSoftStartRamp.
+         *
+         * @param pointRampRateorSoftStartRamp the PointRampRateorSoftStartRamp
+         */
+         public void setPointRampRateorSoftStartRamp(int pointRampRateorSoftStartRamp)
+         {
+            this.pointRampRateorSoftStartRamp = pointRampRateorSoftStartRamp;
+            notifyPropertyChanged(BR.pointRampRateorSoftStartRamp);
+         }
+     
+     
+         /**
+         * Gets the PointControlOutputRate.
+         *
+         * return the PointControlOutputRate
+         */
+         @Bindable
+         public int getPointControlOutputRate()
+         {
+            return pointControlOutputRate;
+         }
+
+         /**
+         * Sets the PointControlOutputRate.
+         *
+         * @param pointControlOutputRate the PointControlOutputRate
+         */
+         public void setPointControlOutputRate(int pointControlOutputRate)
+         {
+            this.pointControlOutputRate = pointControlOutputRate;
+            notifyPropertyChanged(BR.pointControlOutputRate);
+         }
+     
+     
+         /**
+         * Gets the ControlOutputType.
+         *
+         * return the ControlOutputType
+         */
+         @Bindable
+         public int getControlOutputType()
+         {
+            return controlOutputType;
+         }
+
+         /**
+         * Sets the ControlOutputType.
+         *
+         * @param controlOutputType the ControlOutputType
+         */
+         public void setControlOutputType(int controlOutputType)
+         {
+            this.controlOutputType = controlOutputType;
+            notifyPropertyChanged(BR.controlOutputType);
+         }
+     
+     
+         /**
+         * Gets the SsrControlOutputType.
+         *
+         * return the SsrControlOutputType
+         */
+         @Bindable
+         public int getSsrControlOutputType()
+         {
+            return ssrControlOutputType;
+         }
+
+         /**
+         * Sets the SsrControlOutputType.
+         *
+         * @param ssrControlOutputType the SsrControlOutputType
+         */
+         public void setSsrControlOutputType(int ssrControlOutputType)
+         {
+            this.ssrControlOutputType = ssrControlOutputType;
+            notifyPropertyChanged(BR.ssrControlOutputType);
+         }
+     
+     
+         /**
+         * Gets the OutputOnOffHysteresisValue.
+         *
+         * return the OutputOnOffHysteresisValue
+         */
+         @Bindable
+         public int getOutputOnOffHysteresisValue()
+         {
+            return outputOnOffHysteresisValue;
+         }
+
+         /**
+         * Sets the OutputOnOffHysteresisValue.
+         *
+         * @param outputOnOffHysteresisValue the OutputOnOffHysteresisValue
+         */
+         public void setOutputOnOffHysteresisValue(int outputOnOffHysteresisValue)
+         {
+            this.outputOnOffHysteresisValue = outputOnOffHysteresisValue;
+            notifyPropertyChanged(BR.outputOnOffHysteresisValue);
+         }
+     
+     
+         /**
+         * Gets the ProcessVariableSamplingRate.
+         *
+         * return the ProcessVariableSamplingRate
+         */
+         @Bindable
+         public int getProcessVariableSamplingRate()
+         {
+            return processVariableSamplingRate;
+         }
+
+         /**
+         * Sets the ProcessVariableSamplingRate.
+         *
+         * @param processVariableSamplingRate the ProcessVariableSamplingRate
+         */
+         public void setProcessVariableSamplingRate(int processVariableSamplingRate)
+         {
+            this.processVariableSamplingRate = processVariableSamplingRate;
+            notifyPropertyChanged(BR.processVariableSamplingRate);
+         }
+     
+     
+         /**
+         * Gets the PvInputFilterFactorMode.
+         *
+         * return the PvInputFilterFactorMode
+         */
+         @Bindable
+         public int getPvInputFilterFactorMode()
+         {
+            return pvInputFilterFactorMode;
+         }
+
+         /**
+         * Sets the PvInputFilterFactorMode.
+         *
+         * @param pvInputFilterFactorMode the PvInputFilterFactorMode
+         */
+         public void setPvInputFilterFactorMode(int pvInputFilterFactorMode)
+         {
+            this.pvInputFilterFactorMode = pvInputFilterFactorMode;
+            notifyPropertyChanged(BR.pvInputFilterFactorMode);
+         }
+     
+     
+         /**
+         * Gets the HardwarePidControlType.
+         *
+         * return the HardwarePidControlType
+         */
+         @Bindable
+         public HardwarePidControlType getHardwarePidControlType()
+         {
+            return hardwarePidControlType;
+         }
+
+         /**
+         * Sets the HardwarePidControlType.
+         *
+         * @param hardwarePidControlType the HardwarePidControlType
+         */
+         public void setHardwarePidControlType(HardwarePidControlType hardwarePidControlType)
+         {
+            this.hardwarePidControlType = hardwarePidControlType;
+            notifyPropertyChanged(BR.hardwarePidControlType);
+         }
+     
+     
+         /**
+         * Gets the HardwareVersion.
+         *
+         * return the HardwareVersion
+         */
+         @Bindable
+         public HardwareVersion getHardwareVersion()
+         {
+            return hardwareVersion;
+         }
+
+         /**
+         * Sets the HardwareVersion.
+         *
+         * @param hardwareVersion the HardwareVersion
+         */
+         public void setHardwareVersion(HardwareVersion hardwareVersion)
+         {
+            this.hardwareVersion = hardwareVersion;
+            notifyPropertyChanged(BR.hardwareVersion);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java
index 1237dc13d..d29f07c56 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlType.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "HARDWARE_PID_CONTROL_TYPES", database = TangoDB.class, cachingEnabled = true)
+public class HardwarePidControlType extends HardwarePidControlTypeBase
+{
 
-    @Table(name = "HARDWARE_PID_CONTROL_TYPES", database = TangoDB.class)
-    public class HardwarePidControlType extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlTypeBase.java
new file mode 100644
index 000000000..f560be28a
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwarePidControlTypeBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class HardwarePidControlTypeBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java
index 5d6dce0d2..b6b0f7d8d 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "HARDWARE_VERSIONS", database = TangoDB.class, cachingEnabled = true)
+public class HardwareVersion extends HardwareVersionBase
+{
 
-    @Table(name = "HARDWARE_VERSIONS", database = TangoDB.class)
-    public class HardwareVersion extends Entity 
-    {
     
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersionBase.java
new file mode 100644
index 000000000..0b56818ff
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersionBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class HardwareVersionBase extends Entity 
+    {
+    
+            @Column(name = "VERSION")
+            private double version;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+
+     
+         /**
+         * Gets the Version.
+         *
+         * return the Version
+         */
+         @Bindable
+         public double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(double version)
+         {
+            this.version = version;
+            notifyPropertyChanged(BR.version);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java
index 889fbf830..283a13570 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinder.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "HARDWARE_WINDERS", database = TangoDB.class, cachingEnabled = true)
+public class HardwareWinder extends HardwareWinderBase
+{
 
-    @Table(name = "HARDWARE_WINDERS", database = TangoDB.class)
-    public class HardwareWinder extends Entity 
-    {
     
-            @Column(name = "MILLIMETER_PER_ROTATION")
-            private int millimeterPerRotation;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSIONS_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareVersion hardwareVersions;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_WINDER_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private HardwareWinderType hardwareWinderTypes;
-
-    
-
-     
-         /**
-         * Gets the MillimeterPerRotation.
-         *
-         * return the MillimeterPerRotation
-         */
-         @Bindable
-         public int getMillimeterPerRotation()
-         {
-            return millimeterPerRotation;
-         }
-
-         /**
-         * Sets the MillimeterPerRotation.
-         *
-         * @param millimeterPerRotation the MillimeterPerRotation
-         */
-         public void setMillimeterPerRotation(int millimeterPerRotation)
-         {
-            this.millimeterPerRotation = millimeterPerRotation;
-            notifyPropertyChanged(BR.millimeterPerRotation);
-         }
-     
-     
-         /**
-         * Gets the HardwareVersions.
-         *
-         * return the HardwareVersions
-         */
-         @Bindable
-         public HardwareVersion getHardwareVersions()
-         {
-            return hardwareVersions;
-         }
-
-         /**
-         * Sets the HardwareVersions.
-         *
-         * @param hardwareVersions the HardwareVersions
-         */
-         public void setHardwareVersions(HardwareVersion hardwareVersions)
-         {
-            this.hardwareVersions = hardwareVersions;
-            notifyPropertyChanged(BR.hardwareVersions);
-         }
-     
-     
-         /**
-         * Gets the HardwareWinderTypes.
-         *
-         * return the HardwareWinderTypes
-         */
-         @Bindable
-         public HardwareWinderType getHardwareWinderTypes()
-         {
-            return hardwareWinderTypes;
-         }
-
-         /**
-         * Sets the HardwareWinderTypes.
-         *
-         * @param hardwareWinderTypes the HardwareWinderTypes
-         */
-         public void setHardwareWinderTypes(HardwareWinderType hardwareWinderTypes)
-         {
-            this.hardwareWinderTypes = hardwareWinderTypes;
-            notifyPropertyChanged(BR.hardwareWinderTypes);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderBase.java
new file mode 100644
index 000000000..5f951377b
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class HardwareWinderBase extends Entity 
+    {
+    
+            @Column(name = "MILLIMETER_PER_ROTATION")
+            private int millimeterPerRotation;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_VERSION_GUID", foreignKeyColumnName = "GUID")})
+            private HardwareVersion hardwareVersion;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "HARDWARE_WINDER_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private HardwareWinderType hardwareWinderType;
+
+    
+
+     
+         /**
+         * Gets the MillimeterPerRotation.
+         *
+         * return the MillimeterPerRotation
+         */
+         @Bindable
+         public int getMillimeterPerRotation()
+         {
+            return millimeterPerRotation;
+         }
+
+         /**
+         * Sets the MillimeterPerRotation.
+         *
+         * @param millimeterPerRotation the MillimeterPerRotation
+         */
+         public void setMillimeterPerRotation(int millimeterPerRotation)
+         {
+            this.millimeterPerRotation = millimeterPerRotation;
+            notifyPropertyChanged(BR.millimeterPerRotation);
+         }
+     
+     
+         /**
+         * Gets the HardwareVersion.
+         *
+         * return the HardwareVersion
+         */
+         @Bindable
+         public HardwareVersion getHardwareVersion()
+         {
+            return hardwareVersion;
+         }
+
+         /**
+         * Sets the HardwareVersion.
+         *
+         * @param hardwareVersion the HardwareVersion
+         */
+         public void setHardwareVersion(HardwareVersion hardwareVersion)
+         {
+            this.hardwareVersion = hardwareVersion;
+            notifyPropertyChanged(BR.hardwareVersion);
+         }
+     
+     
+         /**
+         * Gets the HardwareWinderType.
+         *
+         * return the HardwareWinderType
+         */
+         @Bindable
+         public HardwareWinderType getHardwareWinderType()
+         {
+            return hardwareWinderType;
+         }
+
+         /**
+         * Sets the HardwareWinderType.
+         *
+         * @param hardwareWinderType the HardwareWinderType
+         */
+         public void setHardwareWinderType(HardwareWinderType hardwareWinderType)
+         {
+            this.hardwareWinderType = hardwareWinderType;
+            notifyPropertyChanged(BR.hardwareWinderType);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java
index 9b8f7ea99..49c3eeaff 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderType.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "HARDWARE_WINDER_TYPES", database = TangoDB.class, cachingEnabled = true)
+public class HardwareWinderType extends HardwareWinderTypeBase
+{
 
-    @Table(name = "HARDWARE_WINDER_TYPES", database = TangoDB.class)
-    public class HardwareWinderType extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderTypeBase.java
new file mode 100644
index 000000000..09d2d5ffd
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareWinderTypeBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class HardwareWinderTypeBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java
index 961a08e2b..d12bcd2d0 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java
@@ -1,242 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "IDS_PACKS", database = TangoDB.class, cachingEnabled = true)
+public class IdsPack extends IdsPackBase
+{
 
-    @Table(name = "IDS_PACKS", database = TangoDB.class)
-    public class IdsPack extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "PACK_INDEX")
-            private int packIndex;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CARTRIDGE_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private CartridgeType cartridgeTypes;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
-            private Configuration configuration;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "DISPENSER_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private DispenserType dispenserTypes;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "IDS_PACK_FORMULAS_GUID", foreignKeyColumnName = "GUID")})
-            private IdsPackFormula idsPackFormulas;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private LiquidType liquidTypes;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MID_TANK_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private MidTankType midTankTypes;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the PackIndex.
-         *
-         * return the PackIndex
-         */
-         @Bindable
-         public int getPackIndex()
-         {
-            return packIndex;
-         }
-
-         /**
-         * Sets the PackIndex.
-         *
-         * @param packIndex the PackIndex
-         */
-         public void setPackIndex(int packIndex)
-         {
-            this.packIndex = packIndex;
-            notifyPropertyChanged(BR.packIndex);
-         }
-     
-     
-         /**
-         * Gets the CartridgeTypes.
-         *
-         * return the CartridgeTypes
-         */
-         @Bindable
-         public CartridgeType getCartridgeTypes()
-         {
-            return cartridgeTypes;
-         }
-
-         /**
-         * Sets the CartridgeTypes.
-         *
-         * @param cartridgeTypes the CartridgeTypes
-         */
-         public void setCartridgeTypes(CartridgeType cartridgeTypes)
-         {
-            this.cartridgeTypes = cartridgeTypes;
-            notifyPropertyChanged(BR.cartridgeTypes);
-         }
-     
-     
-         /**
-         * Gets the Configuration.
-         *
-         * return the Configuration
-         */
-         @Bindable
-         public Configuration getConfiguration()
-         {
-            return configuration;
-         }
-
-         /**
-         * Sets the Configuration.
-         *
-         * @param configuration the Configuration
-         */
-         public void setConfiguration(Configuration configuration)
-         {
-            this.configuration = configuration;
-            notifyPropertyChanged(BR.configuration);
-         }
-     
-     
-         /**
-         * Gets the DispenserTypes.
-         *
-         * return the DispenserTypes
-         */
-         @Bindable
-         public DispenserType getDispenserTypes()
-         {
-            return dispenserTypes;
-         }
-
-         /**
-         * Sets the DispenserTypes.
-         *
-         * @param dispenserTypes the DispenserTypes
-         */
-         public void setDispenserTypes(DispenserType dispenserTypes)
-         {
-            this.dispenserTypes = dispenserTypes;
-            notifyPropertyChanged(BR.dispenserTypes);
-         }
-     
-     
-         /**
-         * Gets the IdsPackFormulas.
-         *
-         * return the IdsPackFormulas
-         */
-         @Bindable
-         public IdsPackFormula getIdsPackFormulas()
-         {
-            return idsPackFormulas;
-         }
-
-         /**
-         * Sets the IdsPackFormulas.
-         *
-         * @param idsPackFormulas the IdsPackFormulas
-         */
-         public void setIdsPackFormulas(IdsPackFormula idsPackFormulas)
-         {
-            this.idsPackFormulas = idsPackFormulas;
-            notifyPropertyChanged(BR.idsPackFormulas);
-         }
-     
-     
-         /**
-         * Gets the LiquidTypes.
-         *
-         * return the LiquidTypes
-         */
-         @Bindable
-         public LiquidType getLiquidTypes()
-         {
-            return liquidTypes;
-         }
-
-         /**
-         * Sets the LiquidTypes.
-         *
-         * @param liquidTypes the LiquidTypes
-         */
-         public void setLiquidTypes(LiquidType liquidTypes)
-         {
-            this.liquidTypes = liquidTypes;
-            notifyPropertyChanged(BR.liquidTypes);
-         }
-     
-     
-         /**
-         * Gets the MidTankTypes.
-         *
-         * return the MidTankTypes
-         */
-         @Bindable
-         public MidTankType getMidTankTypes()
-         {
-            return midTankTypes;
-         }
-
-         /**
-         * Sets the MidTankTypes.
-         *
-         * @param midTankTypes the MidTankTypes
-         */
-         public void setMidTankTypes(MidTankType midTankTypes)
-         {
-            this.midTankTypes = midTankTypes;
-            notifyPropertyChanged(BR.midTankTypes);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackBase.java
new file mode 100644
index 000000000..4552e82c0
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackBase.java
@@ -0,0 +1,239 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class IdsPackBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "PACK_INDEX")
+            private int packIndex;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "CARTRIDGE_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private CartridgeType cartridgeType;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
+            private Configuration configuration;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "DISPENSER_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private DispenserType dispenserType;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "IDS_PACK_FORMULA_GUID", foreignKeyColumnName = "GUID")})
+            private IdsPackFormula idsPackFormula;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private LiquidType liquidType;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "MID_TANK_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private MidTankType midTankType;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the PackIndex.
+         *
+         * return the PackIndex
+         */
+         @Bindable
+         public int getPackIndex()
+         {
+            return packIndex;
+         }
+
+         /**
+         * Sets the PackIndex.
+         *
+         * @param packIndex the PackIndex
+         */
+         public void setPackIndex(int packIndex)
+         {
+            this.packIndex = packIndex;
+            notifyPropertyChanged(BR.packIndex);
+         }
+     
+     
+         /**
+         * Gets the CartridgeType.
+         *
+         * return the CartridgeType
+         */
+         @Bindable
+         public CartridgeType getCartridgeType()
+         {
+            return cartridgeType;
+         }
+
+         /**
+         * Sets the CartridgeType.
+         *
+         * @param cartridgeType the CartridgeType
+         */
+         public void setCartridgeType(CartridgeType cartridgeType)
+         {
+            this.cartridgeType = cartridgeType;
+            notifyPropertyChanged(BR.cartridgeType);
+         }
+     
+     
+         /**
+         * Gets the Configuration.
+         *
+         * return the Configuration
+         */
+         @Bindable
+         public Configuration getConfiguration()
+         {
+            return configuration;
+         }
+
+         /**
+         * Sets the Configuration.
+         *
+         * @param configuration the Configuration
+         */
+         public void setConfiguration(Configuration configuration)
+         {
+            this.configuration = configuration;
+            notifyPropertyChanged(BR.configuration);
+         }
+     
+     
+         /**
+         * Gets the DispenserType.
+         *
+         * return the DispenserType
+         */
+         @Bindable
+         public DispenserType getDispenserType()
+         {
+            return dispenserType;
+         }
+
+         /**
+         * Sets the DispenserType.
+         *
+         * @param dispenserType the DispenserType
+         */
+         public void setDispenserType(DispenserType dispenserType)
+         {
+            this.dispenserType = dispenserType;
+            notifyPropertyChanged(BR.dispenserType);
+         }
+     
+     
+         /**
+         * Gets the IdsPackFormula.
+         *
+         * return the IdsPackFormula
+         */
+         @Bindable
+         public IdsPackFormula getIdsPackFormula()
+         {
+            return idsPackFormula;
+         }
+
+         /**
+         * Sets the IdsPackFormula.
+         *
+         * @param idsPackFormula the IdsPackFormula
+         */
+         public void setIdsPackFormula(IdsPackFormula idsPackFormula)
+         {
+            this.idsPackFormula = idsPackFormula;
+            notifyPropertyChanged(BR.idsPackFormula);
+         }
+     
+     
+         /**
+         * Gets the LiquidType.
+         *
+         * return the LiquidType
+         */
+         @Bindable
+         public LiquidType getLiquidType()
+         {
+            return liquidType;
+         }
+
+         /**
+         * Sets the LiquidType.
+         *
+         * @param liquidType the LiquidType
+         */
+         public void setLiquidType(LiquidType liquidType)
+         {
+            this.liquidType = liquidType;
+            notifyPropertyChanged(BR.liquidType);
+         }
+     
+     
+         /**
+         * Gets the MidTankType.
+         *
+         * return the MidTankType
+         */
+         @Bindable
+         public MidTankType getMidTankType()
+         {
+            return midTankType;
+         }
+
+         /**
+         * Sets the MidTankType.
+         *
+         * @param midTankType the MidTankType
+         */
+         public void setMidTankType(MidTankType midTankType)
+         {
+            this.midTankType = midTankType;
+            notifyPropertyChanged(BR.midTankType);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java
index 1ac479163..5720b4764 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormula.java
@@ -1,130 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "IDS_PACK_FORMULAS", database = TangoDB.class, cachingEnabled = true)
+public class IdsPackFormula extends IdsPackFormulaBase
+{
 
-    @Table(name = "IDS_PACK_FORMULAS", database = TangoDB.class)
-    public class IdsPackFormula extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "AUTO_CALCULATED")
-            private boolean autoCalculated;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the AutoCalculated.
-         *
-         * return the AutoCalculated
-         */
-         @Bindable
-         public boolean isAutoCalculated()
-         {
-            return autoCalculated;
-         }
-
-         /**
-         * Sets the AutoCalculated.
-         *
-         * @param autoCalculated the AutoCalculated
-         */
-         public void setAutoCalculated(boolean autoCalculated)
-         {
-            this.autoCalculated = autoCalculated;
-            notifyPropertyChanged(BR.autoCalculated);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormulaBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormulaBase.java
new file mode 100644
index 000000000..f651ac7cd
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPackFormulaBase.java
@@ -0,0 +1,127 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class IdsPackFormulaBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+    
+            @Column(name = "AUTO_CALCULATED")
+            private boolean autoCalculated;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+     
+         /**
+         * Gets the AutoCalculated.
+         *
+         * return the AutoCalculated
+         */
+         @Bindable
+         public boolean isAutoCalculated()
+         {
+            return autoCalculated;
+         }
+
+         /**
+         * Sets the AutoCalculated.
+         *
+         * @param autoCalculated the AutoCalculated
+         */
+         public void setAutoCalculated(boolean autoCalculated)
+         {
+            this.autoCalculated = autoCalculated;
+            notifyPropertyChanged(BR.autoCalculated);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java
index b82a87548..10df0c9c1 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Job.java
@@ -1,494 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "JOBS", database = TangoDB.class, cachingEnabled = true)
+public class Job extends JobBase
+{
 
-    @Table(name = "JOBS", database = TangoDB.class)
-    public class Job extends Entity 
-    {
     
-            @Column(name = "CREATION_DATE")
-            private DateTime creationDate;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "INTER_SEGMENT_LENGTH")
-            private double interSegmentLength;
-
-    
-    
-            @Column(name = "ENABLE_INTER_SEGMENT")
-            private boolean enableInterSegment;
-
-    
-    
-            @Column(name = "ENABLE_LUBRICATION")
-            private boolean enableLubrication;
-
-    
-    
-            @Column(name = "JOB_INDEX")
-            private int jobIndex;
-
-    
-    
-            @Column(name = "ESTIMATED_DURATION_MILI")
-            private int estimatedDurationMili;
-
-    
-    
-            @Column(name = "HAS_EMBROIDERY_FILE")
-            private boolean hasEmbroideryFile;
-
-    
-    
-            @Column(name = "EMBROIDERY_FILE_DATA")
-            private byte[] embroideryFileData;
-
-    
-    
-            @Column(name = "EMBROIDERY_FILE_NAME")
-            private String embroideryFileName;
-
-    
-    
-            @Column(name = "EMBROIDERY_JPEG")
-            private byte[] embroideryJpeg;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
-            private Machine machine;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
-            private Rml rml;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "SPOOL_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private SpoolType spoolTypes;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
-            private User user;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "WINDING_METHODS_GUID", foreignKeyColumnName = "GUID")})
-            private WindingMethod windingMethods;
-
-    
-
-     
-         /**
-         * Gets the CreationDate.
-         *
-         * return the CreationDate
-         */
-         @Bindable
-         public DateTime getCreationDate()
-         {
-            return creationDate;
-         }
-
-         /**
-         * Sets the CreationDate.
-         *
-         * @param creationDate the CreationDate
-         */
-         public void setCreationDate(DateTime creationDate)
-         {
-            this.creationDate = creationDate;
-            notifyPropertyChanged(BR.creationDate);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the InterSegmentLength.
-         *
-         * return the InterSegmentLength
-         */
-         @Bindable
-         public double getInterSegmentLength()
-         {
-            return interSegmentLength;
-         }
-
-         /**
-         * Sets the InterSegmentLength.
-         *
-         * @param interSegmentLength the InterSegmentLength
-         */
-         public void setInterSegmentLength(double interSegmentLength)
-         {
-            this.interSegmentLength = interSegmentLength;
-            notifyPropertyChanged(BR.interSegmentLength);
-         }
-     
-     
-         /**
-         * Gets the EnableInterSegment.
-         *
-         * return the EnableInterSegment
-         */
-         @Bindable
-         public boolean isEnableInterSegment()
-         {
-            return enableInterSegment;
-         }
-
-         /**
-         * Sets the EnableInterSegment.
-         *
-         * @param enableInterSegment the EnableInterSegment
-         */
-         public void setEnableInterSegment(boolean enableInterSegment)
-         {
-            this.enableInterSegment = enableInterSegment;
-            notifyPropertyChanged(BR.enableInterSegment);
-         }
-     
-     
-         /**
-         * Gets the EnableLubrication.
-         *
-         * return the EnableLubrication
-         */
-         @Bindable
-         public boolean isEnableLubrication()
-         {
-            return enableLubrication;
-         }
-
-         /**
-         * Sets the EnableLubrication.
-         *
-         * @param enableLubrication the EnableLubrication
-         */
-         public void setEnableLubrication(boolean enableLubrication)
-         {
-            this.enableLubrication = enableLubrication;
-            notifyPropertyChanged(BR.enableLubrication);
-         }
-     
-     
-         /**
-         * Gets the JobIndex.
-         *
-         * return the JobIndex
-         */
-         @Bindable
-         public int getJobIndex()
-         {
-            return jobIndex;
-         }
-
-         /**
-         * Sets the JobIndex.
-         *
-         * @param jobIndex the JobIndex
-         */
-         public void setJobIndex(int jobIndex)
-         {
-            this.jobIndex = jobIndex;
-            notifyPropertyChanged(BR.jobIndex);
-         }
-     
-     
-         /**
-         * Gets the EstimatedDurationMili.
-         *
-         * return the EstimatedDurationMili
-         */
-         @Bindable
-         public int getEstimatedDurationMili()
-         {
-            return estimatedDurationMili;
-         }
-
-         /**
-         * Sets the EstimatedDurationMili.
-         *
-         * @param estimatedDurationMili the EstimatedDurationMili
-         */
-         public void setEstimatedDurationMili(int estimatedDurationMili)
-         {
-            this.estimatedDurationMili = estimatedDurationMili;
-            notifyPropertyChanged(BR.estimatedDurationMili);
-         }
-     
-     
-         /**
-         * Gets the HasEmbroideryFile.
-         *
-         * return the HasEmbroideryFile
-         */
-         @Bindable
-         public boolean isHasEmbroideryFile()
-         {
-            return hasEmbroideryFile;
-         }
-
-         /**
-         * Sets the HasEmbroideryFile.
-         *
-         * @param hasEmbroideryFile the HasEmbroideryFile
-         */
-         public void setHasEmbroideryFile(boolean hasEmbroideryFile)
-         {
-            this.hasEmbroideryFile = hasEmbroideryFile;
-            notifyPropertyChanged(BR.hasEmbroideryFile);
-         }
-     
-     
-         /**
-         * Gets the EmbroideryFileData.
-         *
-         * return the EmbroideryFileData
-         */
-         @Bindable
-         public byte[] getEmbroideryFileData()
-         {
-            return embroideryFileData;
-         }
-
-         /**
-         * Sets the EmbroideryFileData.
-         *
-         * @param embroideryFileData the EmbroideryFileData
-         */
-         public void setEmbroideryFileData(byte[] embroideryFileData)
-         {
-            this.embroideryFileData = embroideryFileData;
-            notifyPropertyChanged(BR.embroideryFileData);
-         }
-     
-     
-         /**
-         * Gets the EmbroideryFileName.
-         *
-         * return the EmbroideryFileName
-         */
-         @Bindable
-         public String getEmbroideryFileName()
-         {
-            return embroideryFileName;
-         }
-
-         /**
-         * Sets the EmbroideryFileName.
-         *
-         * @param embroideryFileName the EmbroideryFileName
-         */
-         public void setEmbroideryFileName(String embroideryFileName)
-         {
-            this.embroideryFileName = embroideryFileName;
-            notifyPropertyChanged(BR.embroideryFileName);
-         }
-     
-     
-         /**
-         * Gets the EmbroideryJpeg.
-         *
-         * return the EmbroideryJpeg
-         */
-         @Bindable
-         public byte[] getEmbroideryJpeg()
-         {
-            return embroideryJpeg;
-         }
-
-         /**
-         * Sets the EmbroideryJpeg.
-         *
-         * @param embroideryJpeg the EmbroideryJpeg
-         */
-         public void setEmbroideryJpeg(byte[] embroideryJpeg)
-         {
-            this.embroideryJpeg = embroideryJpeg;
-            notifyPropertyChanged(BR.embroideryJpeg);
-         }
-     
-     
-         /**
-         * Gets the Machine.
-         *
-         * return the Machine
-         */
-         @Bindable
-         public Machine getMachine()
-         {
-            return machine;
-         }
-
-         /**
-         * Sets the Machine.
-         *
-         * @param machine the Machine
-         */
-         public void setMachine(Machine machine)
-         {
-            this.machine = machine;
-            notifyPropertyChanged(BR.machine);
-         }
-     
-     
-         /**
-         * Gets the Rml.
-         *
-         * return the Rml
-         */
-         @Bindable
-         public Rml getRml()
-         {
-            return rml;
-         }
-
-         /**
-         * Sets the Rml.
-         *
-         * @param rml the Rml
-         */
-         public void setRml(Rml rml)
-         {
-            this.rml = rml;
-            notifyPropertyChanged(BR.rml);
-         }
-     
-     
-         /**
-         * Gets the SpoolTypes.
-         *
-         * return the SpoolTypes
-         */
-         @Bindable
-         public SpoolType getSpoolTypes()
-         {
-            return spoolTypes;
-         }
-
-         /**
-         * Sets the SpoolTypes.
-         *
-         * @param spoolTypes the SpoolTypes
-         */
-         public void setSpoolTypes(SpoolType spoolTypes)
-         {
-            this.spoolTypes = spoolTypes;
-            notifyPropertyChanged(BR.spoolTypes);
-         }
-     
-     
-         /**
-         * Gets the User.
-         *
-         * return the User
-         */
-         @Bindable
-         public User getUser()
-         {
-            return user;
-         }
-
-         /**
-         * Sets the User.
-         *
-         * @param user the User
-         */
-         public void setUser(User user)
-         {
-            this.user = user;
-            notifyPropertyChanged(BR.user);
-         }
-     
-     
-         /**
-         * Gets the WindingMethods.
-         *
-         * return the WindingMethods
-         */
-         @Bindable
-         public WindingMethod getWindingMethods()
-         {
-            return windingMethods;
-         }
-
-         /**
-         * Sets the WindingMethods.
-         *
-         * @param windingMethods the WindingMethods
-         */
-         public void setWindingMethods(WindingMethod windingMethods)
-         {
-            this.windingMethods = windingMethods;
-            notifyPropertyChanged(BR.windingMethods);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobBase.java
new file mode 100644
index 000000000..b2c001db3
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobBase.java
@@ -0,0 +1,491 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class JobBase extends Entity 
+    {
+    
+            @Column(name = "CREATION_DATE")
+            private DateTime creationDate;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+    
+            @Column(name = "INTER_SEGMENT_LENGTH")
+            private double interSegmentLength;
+
+    
+    
+            @Column(name = "ENABLE_INTER_SEGMENT")
+            private boolean enableInterSegment;
+
+    
+    
+            @Column(name = "ENABLE_LUBRICATION")
+            private boolean enableLubrication;
+
+    
+    
+            @Column(name = "JOB_INDEX")
+            private int jobIndex;
+
+    
+    
+            @Column(name = "ESTIMATED_DURATION_MILI")
+            private int estimatedDurationMili;
+
+    
+    
+            @Column(name = "HAS_EMBROIDERY_FILE")
+            private boolean hasEmbroideryFile;
+
+    
+    
+            @Column(name = "EMBROIDERY_FILE_DATA")
+            private byte[] embroideryFileData;
+
+    
+    
+            @Column(name = "EMBROIDERY_FILE_NAME")
+            private String embroideryFileName;
+
+    
+    
+            @Column(name = "EMBROIDERY_JPEG")
+            private byte[] embroideryJpeg;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
+            private Machine machine;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
+            private Rml rml;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "SPOOL_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private SpoolType spoolType;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
+            private User user;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "WINDING_METHOD_GUID", foreignKeyColumnName = "GUID")})
+            private WindingMethod windingMethod;
+
+    
+
+     
+         /**
+         * Gets the CreationDate.
+         *
+         * return the CreationDate
+         */
+         @Bindable
+         public DateTime getCreationDate()
+         {
+            return creationDate;
+         }
+
+         /**
+         * Sets the CreationDate.
+         *
+         * @param creationDate the CreationDate
+         */
+         public void setCreationDate(DateTime creationDate)
+         {
+            this.creationDate = creationDate;
+            notifyPropertyChanged(BR.creationDate);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+     
+         /**
+         * Gets the InterSegmentLength.
+         *
+         * return the InterSegmentLength
+         */
+         @Bindable
+         public double getInterSegmentLength()
+         {
+            return interSegmentLength;
+         }
+
+         /**
+         * Sets the InterSegmentLength.
+         *
+         * @param interSegmentLength the InterSegmentLength
+         */
+         public void setInterSegmentLength(double interSegmentLength)
+         {
+            this.interSegmentLength = interSegmentLength;
+            notifyPropertyChanged(BR.interSegmentLength);
+         }
+     
+     
+         /**
+         * Gets the EnableInterSegment.
+         *
+         * return the EnableInterSegment
+         */
+         @Bindable
+         public boolean isEnableInterSegment()
+         {
+            return enableInterSegment;
+         }
+
+         /**
+         * Sets the EnableInterSegment.
+         *
+         * @param enableInterSegment the EnableInterSegment
+         */
+         public void setEnableInterSegment(boolean enableInterSegment)
+         {
+            this.enableInterSegment = enableInterSegment;
+            notifyPropertyChanged(BR.enableInterSegment);
+         }
+     
+     
+         /**
+         * Gets the EnableLubrication.
+         *
+         * return the EnableLubrication
+         */
+         @Bindable
+         public boolean isEnableLubrication()
+         {
+            return enableLubrication;
+         }
+
+         /**
+         * Sets the EnableLubrication.
+         *
+         * @param enableLubrication the EnableLubrication
+         */
+         public void setEnableLubrication(boolean enableLubrication)
+         {
+            this.enableLubrication = enableLubrication;
+            notifyPropertyChanged(BR.enableLubrication);
+         }
+     
+     
+         /**
+         * Gets the JobIndex.
+         *
+         * return the JobIndex
+         */
+         @Bindable
+         public int getJobIndex()
+         {
+            return jobIndex;
+         }
+
+         /**
+         * Sets the JobIndex.
+         *
+         * @param jobIndex the JobIndex
+         */
+         public void setJobIndex(int jobIndex)
+         {
+            this.jobIndex = jobIndex;
+            notifyPropertyChanged(BR.jobIndex);
+         }
+     
+     
+         /**
+         * Gets the EstimatedDurationMili.
+         *
+         * return the EstimatedDurationMili
+         */
+         @Bindable
+         public int getEstimatedDurationMili()
+         {
+            return estimatedDurationMili;
+         }
+
+         /**
+         * Sets the EstimatedDurationMili.
+         *
+         * @param estimatedDurationMili the EstimatedDurationMili
+         */
+         public void setEstimatedDurationMili(int estimatedDurationMili)
+         {
+            this.estimatedDurationMili = estimatedDurationMili;
+            notifyPropertyChanged(BR.estimatedDurationMili);
+         }
+     
+     
+         /**
+         * Gets the HasEmbroideryFile.
+         *
+         * return the HasEmbroideryFile
+         */
+         @Bindable
+         public boolean isHasEmbroideryFile()
+         {
+            return hasEmbroideryFile;
+         }
+
+         /**
+         * Sets the HasEmbroideryFile.
+         *
+         * @param hasEmbroideryFile the HasEmbroideryFile
+         */
+         public void setHasEmbroideryFile(boolean hasEmbroideryFile)
+         {
+            this.hasEmbroideryFile = hasEmbroideryFile;
+            notifyPropertyChanged(BR.hasEmbroideryFile);
+         }
+     
+     
+         /**
+         * Gets the EmbroideryFileData.
+         *
+         * return the EmbroideryFileData
+         */
+         @Bindable
+         public byte[] getEmbroideryFileData()
+         {
+            return embroideryFileData;
+         }
+
+         /**
+         * Sets the EmbroideryFileData.
+         *
+         * @param embroideryFileData the EmbroideryFileData
+         */
+         public void setEmbroideryFileData(byte[] embroideryFileData)
+         {
+            this.embroideryFileData = embroideryFileData;
+            notifyPropertyChanged(BR.embroideryFileData);
+         }
+     
+     
+         /**
+         * Gets the EmbroideryFileName.
+         *
+         * return the EmbroideryFileName
+         */
+         @Bindable
+         public String getEmbroideryFileName()
+         {
+            return embroideryFileName;
+         }
+
+         /**
+         * Sets the EmbroideryFileName.
+         *
+         * @param embroideryFileName the EmbroideryFileName
+         */
+         public void setEmbroideryFileName(String embroideryFileName)
+         {
+            this.embroideryFileName = embroideryFileName;
+            notifyPropertyChanged(BR.embroideryFileName);
+         }
+     
+     
+         /**
+         * Gets the EmbroideryJpeg.
+         *
+         * return the EmbroideryJpeg
+         */
+         @Bindable
+         public byte[] getEmbroideryJpeg()
+         {
+            return embroideryJpeg;
+         }
+
+         /**
+         * Sets the EmbroideryJpeg.
+         *
+         * @param embroideryJpeg the EmbroideryJpeg
+         */
+         public void setEmbroideryJpeg(byte[] embroideryJpeg)
+         {
+            this.embroideryJpeg = embroideryJpeg;
+            notifyPropertyChanged(BR.embroideryJpeg);
+         }
+     
+     
+         /**
+         * Gets the Machine.
+         *
+         * return the Machine
+         */
+         @Bindable
+         public Machine getMachine()
+         {
+            return machine;
+         }
+
+         /**
+         * Sets the Machine.
+         *
+         * @param machine the Machine
+         */
+         public void setMachine(Machine machine)
+         {
+            this.machine = machine;
+            notifyPropertyChanged(BR.machine);
+         }
+     
+     
+         /**
+         * Gets the Rml.
+         *
+         * return the Rml
+         */
+         @Bindable
+         public Rml getRml()
+         {
+            return rml;
+         }
+
+         /**
+         * Sets the Rml.
+         *
+         * @param rml the Rml
+         */
+         public void setRml(Rml rml)
+         {
+            this.rml = rml;
+            notifyPropertyChanged(BR.rml);
+         }
+     
+     
+         /**
+         * Gets the SpoolType.
+         *
+         * return the SpoolType
+         */
+         @Bindable
+         public SpoolType getSpoolType()
+         {
+            return spoolType;
+         }
+
+         /**
+         * Sets the SpoolType.
+         *
+         * @param spoolType the SpoolType
+         */
+         public void setSpoolType(SpoolType spoolType)
+         {
+            this.spoolType = spoolType;
+            notifyPropertyChanged(BR.spoolType);
+         }
+     
+     
+         /**
+         * Gets the User.
+         *
+         * return the User
+         */
+         @Bindable
+         public User getUser()
+         {
+            return user;
+         }
+
+         /**
+         * Sets the User.
+         *
+         * @param user the User
+         */
+         public void setUser(User user)
+         {
+            this.user = user;
+            notifyPropertyChanged(BR.user);
+         }
+     
+     
+         /**
+         * Gets the WindingMethod.
+         *
+         * return the WindingMethod
+         */
+         @Bindable
+         public WindingMethod getWindingMethod()
+         {
+            return windingMethod;
+         }
+
+         /**
+         * Sets the WindingMethod.
+         *
+         * @param windingMethod the WindingMethod
+         */
+         public void setWindingMethod(WindingMethod windingMethod)
+         {
+            this.windingMethod = windingMethod;
+            notifyPropertyChanged(BR.windingMethod);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java
index c67f1b496..5e2d1c56c 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRun.java
@@ -1,130 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "JOB_RUNS", database = TangoDB.class, cachingEnabled = true)
+public class JobRun extends JobRunBase
+{
 
-    @Table(name = "JOB_RUNS", database = TangoDB.class)
-    public class JobRun extends Entity 
-    {
     
-            @Column(name = "START_DATE")
-            private DateTime startDate;
-
-    
-    
-            @Column(name = "END_DATE")
-            private DateTime endDate;
-
-    
-    
-            @Column(name = "SUCCESSFUL")
-            private boolean successful;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "JOB_GUID", foreignKeyColumnName = "GUID")})
-            private Job job;
-
-    
-
-     
-         /**
-         * Gets the StartDate.
-         *
-         * return the StartDate
-         */
-         @Bindable
-         public DateTime getStartDate()
-         {
-            return startDate;
-         }
-
-         /**
-         * Sets the StartDate.
-         *
-         * @param startDate the StartDate
-         */
-         public void setStartDate(DateTime startDate)
-         {
-            this.startDate = startDate;
-            notifyPropertyChanged(BR.startDate);
-         }
-     
-     
-         /**
-         * Gets the EndDate.
-         *
-         * return the EndDate
-         */
-         @Bindable
-         public DateTime getEndDate()
-         {
-            return endDate;
-         }
-
-         /**
-         * Sets the EndDate.
-         *
-         * @param endDate the EndDate
-         */
-         public void setEndDate(DateTime endDate)
-         {
-            this.endDate = endDate;
-            notifyPropertyChanged(BR.endDate);
-         }
-     
-     
-         /**
-         * Gets the Successful.
-         *
-         * return the Successful
-         */
-         @Bindable
-         public boolean isSuccessful()
-         {
-            return successful;
-         }
-
-         /**
-         * Sets the Successful.
-         *
-         * @param successful the Successful
-         */
-         public void setSuccessful(boolean successful)
-         {
-            this.successful = successful;
-            notifyPropertyChanged(BR.successful);
-         }
-     
-     
-         /**
-         * Gets the Job.
-         *
-         * return the Job
-         */
-         @Bindable
-         public Job getJob()
-         {
-            return job;
-         }
-
-         /**
-         * Sets the Job.
-         *
-         * @param job the Job
-         */
-         public void setJob(Job job)
-         {
-            this.job = job;
-            notifyPropertyChanged(BR.job);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRunBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRunBase.java
new file mode 100644
index 000000000..c97f84f8f
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/JobRunBase.java
@@ -0,0 +1,127 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class JobRunBase extends Entity 
+    {
+    
+            @Column(name = "START_DATE")
+            private DateTime startDate;
+
+    
+    
+            @Column(name = "END_DATE")
+            private DateTime endDate;
+
+    
+    
+            @Column(name = "SUCCESSFUL")
+            private boolean successful;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "JOB_GUID", foreignKeyColumnName = "GUID")})
+            private Job job;
+
+    
+
+     
+         /**
+         * Gets the StartDate.
+         *
+         * return the StartDate
+         */
+         @Bindable
+         public DateTime getStartDate()
+         {
+            return startDate;
+         }
+
+         /**
+         * Sets the StartDate.
+         *
+         * @param startDate the StartDate
+         */
+         public void setStartDate(DateTime startDate)
+         {
+            this.startDate = startDate;
+            notifyPropertyChanged(BR.startDate);
+         }
+     
+     
+         /**
+         * Gets the EndDate.
+         *
+         * return the EndDate
+         */
+         @Bindable
+         public DateTime getEndDate()
+         {
+            return endDate;
+         }
+
+         /**
+         * Sets the EndDate.
+         *
+         * @param endDate the EndDate
+         */
+         public void setEndDate(DateTime endDate)
+         {
+            this.endDate = endDate;
+            notifyPropertyChanged(BR.endDate);
+         }
+     
+     
+         /**
+         * Gets the Successful.
+         *
+         * return the Successful
+         */
+         @Bindable
+         public boolean isSuccessful()
+         {
+            return successful;
+         }
+
+         /**
+         * Sets the Successful.
+         *
+         * @param successful the Successful
+         */
+         public void setSuccessful(boolean successful)
+         {
+            this.successful = successful;
+            notifyPropertyChanged(BR.successful);
+         }
+     
+     
+         /**
+         * Gets the Job.
+         *
+         * return the Job
+         */
+         @Bindable
+         public Job getJob()
+         {
+            return job;
+         }
+
+         /**
+         * Sets the Job.
+         *
+         * @param job the Job
+         */
+         public void setJob(Job job)
+         {
+            this.job = job;
+            notifyPropertyChanged(BR.job);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java
index b1162c252..475d8beac 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "LINEAR_MASS_DENSITY_UNITS", database = TangoDB.class, cachingEnabled = true)
+public class LinearMassDensityUnit extends LinearMassDensityUnitBase
+{
 
-    @Table(name = "LINEAR_MASS_DENSITY_UNITS", database = TangoDB.class)
-    public class LinearMassDensityUnit extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnitBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnitBase.java
new file mode 100644
index 000000000..8179be400
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnitBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class LinearMassDensityUnitBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java
index 2e75e30d5..fec3c8e78 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidType.java
@@ -1,130 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "LIQUID_TYPES", database = TangoDB.class, cachingEnabled = true)
+public class LiquidType extends LiquidTypeBase
+{
 
-    @Table(name = "LIQUID_TYPES", database = TangoDB.class)
-    public class LiquidType extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "COLOR")
-            private int color;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Color.
-         *
-         * return the Color
-         */
-         @Bindable
-         public int getColor()
-         {
-            return color;
-         }
-
-         /**
-         * Sets the Color.
-         *
-         * @param color the Color
-         */
-         public void setColor(int color)
-         {
-            this.color = color;
-            notifyPropertyChanged(BR.color);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypeBase.java
new file mode 100644
index 000000000..0ab2ec5f3
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypeBase.java
@@ -0,0 +1,127 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class LiquidTypeBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "VERSION")
+            private double version;
+
+    
+    
+            @Column(name = "COLOR")
+            private int color;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Version.
+         *
+         * return the Version
+         */
+         @Bindable
+         public double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(double version)
+         {
+            this.version = version;
+            notifyPropertyChanged(BR.version);
+         }
+     
+     
+         /**
+         * Gets the Color.
+         *
+         * return the Color
+         */
+         @Bindable
+         public int getColor()
+         {
+            return color;
+         }
+
+         /**
+         * Sets the Color.
+         *
+         * @param color the Color
+         */
+         public void setColor(int color)
+         {
+            this.color = color;
+            notifyPropertyChanged(BR.color);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java
index b3109182b..65ea0b02e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRml.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "LIQUID_TYPES_RMLS", database = TangoDB.class, cachingEnabled = true)
+public class LiquidTypesRml extends LiquidTypesRmlBase
+{
 
-    @Table(name = "LIQUID_TYPES_RMLS", database = TangoDB.class)
-    public class LiquidTypesRml extends Entity 
-    {
     
-            @Column(name = "MAX_NL_PER_CM")
-            private double maxNlPerCm;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private LiquidType liquidTypes;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
-            private Rml rml;
-
-    
-
-     
-         /**
-         * Gets the MaxNlPerCm.
-         *
-         * return the MaxNlPerCm
-         */
-         @Bindable
-         public double getMaxNlPerCm()
-         {
-            return maxNlPerCm;
-         }
-
-         /**
-         * Sets the MaxNlPerCm.
-         *
-         * @param maxNlPerCm the MaxNlPerCm
-         */
-         public void setMaxNlPerCm(double maxNlPerCm)
-         {
-            this.maxNlPerCm = maxNlPerCm;
-            notifyPropertyChanged(BR.maxNlPerCm);
-         }
-     
-     
-         /**
-         * Gets the LiquidTypes.
-         *
-         * return the LiquidTypes
-         */
-         @Bindable
-         public LiquidType getLiquidTypes()
-         {
-            return liquidTypes;
-         }
-
-         /**
-         * Sets the LiquidTypes.
-         *
-         * @param liquidTypes the LiquidTypes
-         */
-         public void setLiquidTypes(LiquidType liquidTypes)
-         {
-            this.liquidTypes = liquidTypes;
-            notifyPropertyChanged(BR.liquidTypes);
-         }
-     
-     
-         /**
-         * Gets the Rml.
-         *
-         * return the Rml
-         */
-         @Bindable
-         public Rml getRml()
-         {
-            return rml;
-         }
-
-         /**
-         * Sets the Rml.
-         *
-         * @param rml the Rml
-         */
-         public void setRml(Rml rml)
-         {
-            this.rml = rml;
-            notifyPropertyChanged(BR.rml);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRmlBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRmlBase.java
new file mode 100644
index 000000000..531537360
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidTypesRmlBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class LiquidTypesRmlBase extends Entity 
+    {
+    
+            @Column(name = "MAX_NL_PER_CM")
+            private double maxNlPerCm;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private LiquidType liquidType;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
+            private Rml rml;
+
+    
+
+     
+         /**
+         * Gets the MaxNlPerCm.
+         *
+         * return the MaxNlPerCm
+         */
+         @Bindable
+         public double getMaxNlPerCm()
+         {
+            return maxNlPerCm;
+         }
+
+         /**
+         * Sets the MaxNlPerCm.
+         *
+         * @param maxNlPerCm the MaxNlPerCm
+         */
+         public void setMaxNlPerCm(double maxNlPerCm)
+         {
+            this.maxNlPerCm = maxNlPerCm;
+            notifyPropertyChanged(BR.maxNlPerCm);
+         }
+     
+     
+         /**
+         * Gets the LiquidType.
+         *
+         * return the LiquidType
+         */
+         @Bindable
+         public LiquidType getLiquidType()
+         {
+            return liquidType;
+         }
+
+         /**
+         * Sets the LiquidType.
+         *
+         * @param liquidType the LiquidType
+         */
+         public void setLiquidType(LiquidType liquidType)
+         {
+            this.liquidType = liquidType;
+            notifyPropertyChanged(BR.liquidType);
+         }
+     
+     
+         /**
+         * Gets the Rml.
+         *
+         * return the Rml
+         */
+         @Bindable
+         public Rml getRml()
+         {
+            return rml;
+         }
+
+         /**
+         * Sets the Rml.
+         *
+         * @param rml the Rml
+         */
+         public void setRml(Rml rml)
+         {
+            this.rml = rml;
+            notifyPropertyChanged(BR.rml);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java
index a581c52f3..162416be5 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java
@@ -1,242 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "MACHINES", database = TangoDB.class, cachingEnabled = true)
+public class Machine extends MachineBase
+{
 
-    @Table(name = "MACHINES", database = TangoDB.class)
-    public class Machine extends Entity 
-    {
     
-            @Column(name = "SERIAL_NUMBER")
-            private String serialNumber;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "PRODUCTION_DATE")
-            private DateTime productionDate;
-
-    
-    
-            @Column(name = "EXTERNAL_BRIDGE_PASSWORD")
-            private String externalBridgePassword;
-
-    
-    
-            @Column(name = "SYNCHED")
-            private boolean synched;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
-            private Configuration configuration;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_VERSIONS_GUID", foreignKeyColumnName = "GUID")})
-            private MachineVersion machineVersions;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "ORGANIZATION_GUID", foreignKeyColumnName = "GUID")})
-            private Organization organization;
-
-    
-
-     
-         /**
-         * Gets the SerialNumber.
-         *
-         * return the SerialNumber
-         */
-         @Bindable
-         public String getSerialNumber()
-         {
-            return serialNumber;
-         }
-
-         /**
-         * Sets the SerialNumber.
-         *
-         * @param serialNumber the SerialNumber
-         */
-         public void setSerialNumber(String serialNumber)
-         {
-            this.serialNumber = serialNumber;
-            notifyPropertyChanged(BR.serialNumber);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the ProductionDate.
-         *
-         * return the ProductionDate
-         */
-         @Bindable
-         public DateTime getProductionDate()
-         {
-            return productionDate;
-         }
-
-         /**
-         * Sets the ProductionDate.
-         *
-         * @param productionDate the ProductionDate
-         */
-         public void setProductionDate(DateTime productionDate)
-         {
-            this.productionDate = productionDate;
-            notifyPropertyChanged(BR.productionDate);
-         }
-     
-     
-         /**
-         * Gets the ExternalBridgePassword.
-         *
-         * return the ExternalBridgePassword
-         */
-         @Bindable
-         public String getExternalBridgePassword()
-         {
-            return externalBridgePassword;
-         }
-
-         /**
-         * Sets the ExternalBridgePassword.
-         *
-         * @param externalBridgePassword the ExternalBridgePassword
-         */
-         public void setExternalBridgePassword(String externalBridgePassword)
-         {
-            this.externalBridgePassword = externalBridgePassword;
-            notifyPropertyChanged(BR.externalBridgePassword);
-         }
-     
-     
-         /**
-         * Gets the Synched.
-         *
-         * return the Synched
-         */
-         @Bindable
-         public boolean isSynched()
-         {
-            return synched;
-         }
-
-         /**
-         * Sets the Synched.
-         *
-         * @param synched the Synched
-         */
-         public void setSynched(boolean synched)
-         {
-            this.synched = synched;
-            notifyPropertyChanged(BR.synched);
-         }
-     
-     
-         /**
-         * Gets the Configuration.
-         *
-         * return the Configuration
-         */
-         @Bindable
-         public Configuration getConfiguration()
-         {
-            return configuration;
-         }
-
-         /**
-         * Sets the Configuration.
-         *
-         * @param configuration the Configuration
-         */
-         public void setConfiguration(Configuration configuration)
-         {
-            this.configuration = configuration;
-            notifyPropertyChanged(BR.configuration);
-         }
-     
-     
-         /**
-         * Gets the MachineVersions.
-         *
-         * return the MachineVersions
-         */
-         @Bindable
-         public MachineVersion getMachineVersions()
-         {
-            return machineVersions;
-         }
-
-         /**
-         * Sets the MachineVersions.
-         *
-         * @param machineVersions the MachineVersions
-         */
-         public void setMachineVersions(MachineVersion machineVersions)
-         {
-            this.machineVersions = machineVersions;
-            notifyPropertyChanged(BR.machineVersions);
-         }
-     
-     
-         /**
-         * Gets the Organization.
-         *
-         * return the Organization
-         */
-         @Bindable
-         public Organization getOrganization()
-         {
-            return organization;
-         }
-
-         /**
-         * Sets the Organization.
-         *
-         * @param organization the Organization
-         */
-         public void setOrganization(Organization organization)
-         {
-            this.organization = organization;
-            notifyPropertyChanged(BR.organization);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineBase.java
new file mode 100644
index 000000000..05678fbbb
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineBase.java
@@ -0,0 +1,239 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class MachineBase extends Entity 
+    {
+    
+            @Column(name = "SERIAL_NUMBER")
+            private String serialNumber;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "PRODUCTION_DATE")
+            private DateTime productionDate;
+
+    
+    
+            @Column(name = "EXTERNAL_BRIDGE_PASSWORD")
+            private String externalBridgePassword;
+
+    
+    
+            @Column(name = "SYNCHED")
+            private boolean synched;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
+            private Configuration configuration;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_VERSION_GUID", foreignKeyColumnName = "GUID")})
+            private MachineVersion machineVersion;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "ORGANIZATION_GUID", foreignKeyColumnName = "GUID")})
+            private Organization organization;
+
+    
+
+     
+         /**
+         * Gets the SerialNumber.
+         *
+         * return the SerialNumber
+         */
+         @Bindable
+         public String getSerialNumber()
+         {
+            return serialNumber;
+         }
+
+         /**
+         * Sets the SerialNumber.
+         *
+         * @param serialNumber the SerialNumber
+         */
+         public void setSerialNumber(String serialNumber)
+         {
+            this.serialNumber = serialNumber;
+            notifyPropertyChanged(BR.serialNumber);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the ProductionDate.
+         *
+         * return the ProductionDate
+         */
+         @Bindable
+         public DateTime getProductionDate()
+         {
+            return productionDate;
+         }
+
+         /**
+         * Sets the ProductionDate.
+         *
+         * @param productionDate the ProductionDate
+         */
+         public void setProductionDate(DateTime productionDate)
+         {
+            this.productionDate = productionDate;
+            notifyPropertyChanged(BR.productionDate);
+         }
+     
+     
+         /**
+         * Gets the ExternalBridgePassword.
+         *
+         * return the ExternalBridgePassword
+         */
+         @Bindable
+         public String getExternalBridgePassword()
+         {
+            return externalBridgePassword;
+         }
+
+         /**
+         * Sets the ExternalBridgePassword.
+         *
+         * @param externalBridgePassword the ExternalBridgePassword
+         */
+         public void setExternalBridgePassword(String externalBridgePassword)
+         {
+            this.externalBridgePassword = externalBridgePassword;
+            notifyPropertyChanged(BR.externalBridgePassword);
+         }
+     
+     
+         /**
+         * Gets the Synched.
+         *
+         * return the Synched
+         */
+         @Bindable
+         public boolean isSynched()
+         {
+            return synched;
+         }
+
+         /**
+         * Sets the Synched.
+         *
+         * @param synched the Synched
+         */
+         public void setSynched(boolean synched)
+         {
+            this.synched = synched;
+            notifyPropertyChanged(BR.synched);
+         }
+     
+     
+         /**
+         * Gets the Configuration.
+         *
+         * return the Configuration
+         */
+         @Bindable
+         public Configuration getConfiguration()
+         {
+            return configuration;
+         }
+
+         /**
+         * Sets the Configuration.
+         *
+         * @param configuration the Configuration
+         */
+         public void setConfiguration(Configuration configuration)
+         {
+            this.configuration = configuration;
+            notifyPropertyChanged(BR.configuration);
+         }
+     
+     
+         /**
+         * Gets the MachineVersion.
+         *
+         * return the MachineVersion
+         */
+         @Bindable
+         public MachineVersion getMachineVersion()
+         {
+            return machineVersion;
+         }
+
+         /**
+         * Sets the MachineVersion.
+         *
+         * @param machineVersion the MachineVersion
+         */
+         public void setMachineVersion(MachineVersion machineVersion)
+         {
+            this.machineVersion = machineVersion;
+            notifyPropertyChanged(BR.machineVersion);
+         }
+     
+     
+         /**
+         * Gets the Organization.
+         *
+         * return the Organization
+         */
+         @Bindable
+         public Organization getOrganization()
+         {
+            return organization;
+         }
+
+         /**
+         * Sets the Organization.
+         *
+         * @param organization the Organization
+         */
+         public void setOrganization(Organization organization)
+         {
+            this.organization = organization;
+            notifyPropertyChanged(BR.organization);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java
index 5090163c2..903a3e5ff 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersion.java
@@ -1,130 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "MACHINE_STUDIO_VERSIONS", database = TangoDB.class, cachingEnabled = true)
+public class MachineStudioVersion extends MachineStudioVersionBase
+{
 
-    @Table(name = "MACHINE_STUDIO_VERSIONS", database = TangoDB.class)
-    public class MachineStudioVersion extends Entity 
-    {
     
-            @Column(name = "VERSION")
-            private String version;
-
-    
-    
-            @Column(name = "FTP_FILE_PATH")
-            private String ftpFilePath;
-
-    
-    
-            @Column(name = "COMMENTS")
-            private String comments;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
-            private User user;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public String getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(String version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the FtpFilePath.
-         *
-         * return the FtpFilePath
-         */
-         @Bindable
-         public String getFtpFilePath()
-         {
-            return ftpFilePath;
-         }
-
-         /**
-         * Sets the FtpFilePath.
-         *
-         * @param ftpFilePath the FtpFilePath
-         */
-         public void setFtpFilePath(String ftpFilePath)
-         {
-            this.ftpFilePath = ftpFilePath;
-            notifyPropertyChanged(BR.ftpFilePath);
-         }
-     
-     
-         /**
-         * Gets the Comments.
-         *
-         * return the Comments
-         */
-         @Bindable
-         public String getComments()
-         {
-            return comments;
-         }
-
-         /**
-         * Sets the Comments.
-         *
-         * @param comments the Comments
-         */
-         public void setComments(String comments)
-         {
-            this.comments = comments;
-            notifyPropertyChanged(BR.comments);
-         }
-     
-     
-         /**
-         * Gets the User.
-         *
-         * return the User
-         */
-         @Bindable
-         public User getUser()
-         {
-            return user;
-         }
-
-         /**
-         * Sets the User.
-         *
-         * @param user the User
-         */
-         public void setUser(User user)
-         {
-            this.user = user;
-            notifyPropertyChanged(BR.user);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersionBase.java
new file mode 100644
index 000000000..206f597a6
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineStudioVersionBase.java
@@ -0,0 +1,127 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class MachineStudioVersionBase extends Entity 
+    {
+    
+            @Column(name = "VERSION")
+            private String version;
+
+    
+    
+            @Column(name = "FTP_FILE_PATH")
+            private String ftpFilePath;
+
+    
+    
+            @Column(name = "COMMENTS")
+            private String comments;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
+            private User user;
+
+    
+
+     
+         /**
+         * Gets the Version.
+         *
+         * return the Version
+         */
+         @Bindable
+         public String getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(String version)
+         {
+            this.version = version;
+            notifyPropertyChanged(BR.version);
+         }
+     
+     
+         /**
+         * Gets the FtpFilePath.
+         *
+         * return the FtpFilePath
+         */
+         @Bindable
+         public String getFtpFilePath()
+         {
+            return ftpFilePath;
+         }
+
+         /**
+         * Sets the FtpFilePath.
+         *
+         * @param ftpFilePath the FtpFilePath
+         */
+         public void setFtpFilePath(String ftpFilePath)
+         {
+            this.ftpFilePath = ftpFilePath;
+            notifyPropertyChanged(BR.ftpFilePath);
+         }
+     
+     
+         /**
+         * Gets the Comments.
+         *
+         * return the Comments
+         */
+         @Bindable
+         public String getComments()
+         {
+            return comments;
+         }
+
+         /**
+         * Sets the Comments.
+         *
+         * @param comments the Comments
+         */
+         public void setComments(String comments)
+         {
+            this.comments = comments;
+            notifyPropertyChanged(BR.comments);
+         }
+     
+     
+         /**
+         * Gets the User.
+         *
+         * return the User
+         */
+         @Bindable
+         public User getUser()
+         {
+            return user;
+         }
+
+         /**
+         * Sets the User.
+         *
+         * @param user the User
+         */
+         public void setUser(User user)
+         {
+            this.user = user;
+            notifyPropertyChanged(BR.user);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java
index cdc1b3643..77d866ec3 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "MACHINE_VERSIONS", database = TangoDB.class, cachingEnabled = true)
+public class MachineVersion extends MachineVersionBase
+{
 
-    @Table(name = "MACHINE_VERSIONS", database = TangoDB.class)
-    public class MachineVersion extends Entity 
-    {
     
-            @Column(name = "VERSION")
-            private double version;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
-            private Configuration configuration;
-
-    
-
-     
-         /**
-         * Gets the Version.
-         *
-         * return the Version
-         */
-         @Bindable
-         public double getVersion()
-         {
-            return version;
-         }
-
-         /**
-         * Sets the Version.
-         *
-         * @param version the Version
-         */
-         public void setVersion(double version)
-         {
-            this.version = version;
-            notifyPropertyChanged(BR.version);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Configuration.
-         *
-         * return the Configuration
-         */
-         @Bindable
-         public Configuration getConfiguration()
-         {
-            return configuration;
-         }
-
-         /**
-         * Sets the Configuration.
-         *
-         * @param configuration the Configuration
-         */
-         public void setConfiguration(Configuration configuration)
-         {
-            this.configuration = configuration;
-            notifyPropertyChanged(BR.configuration);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersionBase.java
new file mode 100644
index 000000000..bc0da03e5
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersionBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class MachineVersionBase extends Entity 
+    {
+    
+            @Column(name = "VERSION")
+            private double version;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
+            private Configuration configuration;
+
+    
+
+     
+         /**
+         * Gets the Version.
+         *
+         * return the Version
+         */
+         @Bindable
+         public double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(double version)
+         {
+            this.version = version;
+            notifyPropertyChanged(BR.version);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Configuration.
+         *
+         * return the Configuration
+         */
+         @Bindable
+         public Configuration getConfiguration()
+         {
+            return configuration;
+         }
+
+         /**
+         * Sets the Configuration.
+         *
+         * @param configuration the Configuration
+         */
+         public void setConfiguration(Configuration configuration)
+         {
+            this.configuration = configuration;
+            notifyPropertyChanged(BR.configuration);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java
index 3e32280f9..c43629185 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "MACHINES_CONFIGURATIONS", database = TangoDB.class, cachingEnabled = true)
+public class MachinesConfiguration extends MachinesConfigurationBase
+{
 
-    @Table(name = "MACHINES_CONFIGURATIONS", database = TangoDB.class)
-    public class MachinesConfiguration extends Entity 
-    {
     
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
-            private Configuration configuration;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
-            private Machine machine;
-
-    
-
-     
-         /**
-         * Gets the Configuration.
-         *
-         * return the Configuration
-         */
-         @Bindable
-         public Configuration getConfiguration()
-         {
-            return configuration;
-         }
-
-         /**
-         * Sets the Configuration.
-         *
-         * @param configuration the Configuration
-         */
-         public void setConfiguration(Configuration configuration)
-         {
-            this.configuration = configuration;
-            notifyPropertyChanged(BR.configuration);
-         }
-     
-     
-         /**
-         * Gets the Machine.
-         *
-         * return the Machine
-         */
-         @Bindable
-         public Machine getMachine()
-         {
-            return machine;
-         }
-
-         /**
-         * Sets the Machine.
-         *
-         * @param machine the Machine
-         */
-         public void setMachine(Machine machine)
-         {
-            this.machine = machine;
-            notifyPropertyChanged(BR.machine);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfigurationBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfigurationBase.java
new file mode 100644
index 000000000..3f2fab5da
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfigurationBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class MachinesConfigurationBase extends Entity 
+    {
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
+            private Configuration configuration;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
+            private Machine machine;
+
+    
+
+     
+         /**
+         * Gets the Configuration.
+         *
+         * return the Configuration
+         */
+         @Bindable
+         public Configuration getConfiguration()
+         {
+            return configuration;
+         }
+
+         /**
+         * Sets the Configuration.
+         *
+         * @param configuration the Configuration
+         */
+         public void setConfiguration(Configuration configuration)
+         {
+            this.configuration = configuration;
+            notifyPropertyChanged(BR.configuration);
+         }
+     
+     
+         /**
+         * Gets the Machine.
+         *
+         * return the Machine
+         */
+         @Bindable
+         public Machine getMachine()
+         {
+            return machine;
+         }
+
+         /**
+         * Sets the Machine.
+         *
+         * @param machine the Machine
+         */
+         public void setMachine(Machine machine)
+         {
+            this.machine = machine;
+            notifyPropertyChanged(BR.machine);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java
index 993f03906..dbb64b499 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java
@@ -1,186 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "MACHINES_EVENTS", database = TangoDB.class, cachingEnabled = true)
+public class MachinesEvent extends MachinesEventBase
+{
 
-    @Table(name = "MACHINES_EVENTS", database = TangoDB.class)
-    public class MachinesEvent extends Entity 
-    {
     
-            @Column(name = "HOST_NAME")
-            private String hostName;
-
-    
-    
-            @Column(name = "DATE_TIME")
-            private DateTime dateTime;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_TYPES_GUID", foreignKeyColumnName = "GUID")})
-            private EventType eventTypes;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
-            private Machine machine;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
-            private User user;
-
-    
-
-     
-         /**
-         * Gets the HostName.
-         *
-         * return the HostName
-         */
-         @Bindable
-         public String getHostName()
-         {
-            return hostName;
-         }
-
-         /**
-         * Sets the HostName.
-         *
-         * @param hostName the HostName
-         */
-         public void setHostName(String hostName)
-         {
-            this.hostName = hostName;
-            notifyPropertyChanged(BR.hostName);
-         }
-     
-     
-         /**
-         * Gets the DateTime.
-         *
-         * return the DateTime
-         */
-         @Bindable
-         public DateTime getDateTime()
-         {
-            return dateTime;
-         }
-
-         /**
-         * Sets the DateTime.
-         *
-         * @param dateTime the DateTime
-         */
-         public void setDateTime(DateTime dateTime)
-         {
-            this.dateTime = dateTime;
-            notifyPropertyChanged(BR.dateTime);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the EventTypes.
-         *
-         * return the EventTypes
-         */
-         @Bindable
-         public EventType getEventTypes()
-         {
-            return eventTypes;
-         }
-
-         /**
-         * Sets the EventTypes.
-         *
-         * @param eventTypes the EventTypes
-         */
-         public void setEventTypes(EventType eventTypes)
-         {
-            this.eventTypes = eventTypes;
-            notifyPropertyChanged(BR.eventTypes);
-         }
-     
-     
-         /**
-         * Gets the Machine.
-         *
-         * return the Machine
-         */
-         @Bindable
-         public Machine getMachine()
-         {
-            return machine;
-         }
-
-         /**
-         * Sets the Machine.
-         *
-         * @param machine the Machine
-         */
-         public void setMachine(Machine machine)
-         {
-            this.machine = machine;
-            notifyPropertyChanged(BR.machine);
-         }
-     
-     
-         /**
-         * Gets the User.
-         *
-         * return the User
-         */
-         @Bindable
-         public User getUser()
-         {
-            return user;
-         }
-
-         /**
-         * Sets the User.
-         *
-         * @param user the User
-         */
-         public void setUser(User user)
-         {
-            this.user = user;
-            notifyPropertyChanged(BR.user);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEventBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEventBase.java
new file mode 100644
index 000000000..e35e293db
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEventBase.java
@@ -0,0 +1,183 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class MachinesEventBase extends Entity 
+    {
+    
+            @Column(name = "HOST_NAME")
+            private String hostName;
+
+    
+    
+            @Column(name = "DATE_TIME")
+            private DateTime dateTime;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private EventType eventType;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
+            private Machine machine;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
+            private User user;
+
+    
+
+     
+         /**
+         * Gets the HostName.
+         *
+         * return the HostName
+         */
+         @Bindable
+         public String getHostName()
+         {
+            return hostName;
+         }
+
+         /**
+         * Sets the HostName.
+         *
+         * @param hostName the HostName
+         */
+         public void setHostName(String hostName)
+         {
+            this.hostName = hostName;
+            notifyPropertyChanged(BR.hostName);
+         }
+     
+     
+         /**
+         * Gets the DateTime.
+         *
+         * return the DateTime
+         */
+         @Bindable
+         public DateTime getDateTime()
+         {
+            return dateTime;
+         }
+
+         /**
+         * Sets the DateTime.
+         *
+         * @param dateTime the DateTime
+         */
+         public void setDateTime(DateTime dateTime)
+         {
+            this.dateTime = dateTime;
+            notifyPropertyChanged(BR.dateTime);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+     
+         /**
+         * Gets the EventType.
+         *
+         * return the EventType
+         */
+         @Bindable
+         public EventType getEventType()
+         {
+            return eventType;
+         }
+
+         /**
+         * Sets the EventType.
+         *
+         * @param eventType the EventType
+         */
+         public void setEventType(EventType eventType)
+         {
+            this.eventType = eventType;
+            notifyPropertyChanged(BR.eventType);
+         }
+     
+     
+         /**
+         * Gets the Machine.
+         *
+         * return the Machine
+         */
+         @Bindable
+         public Machine getMachine()
+         {
+            return machine;
+         }
+
+         /**
+         * Sets the Machine.
+         *
+         * @param machine the Machine
+         */
+         public void setMachine(Machine machine)
+         {
+            this.machine = machine;
+            notifyPropertyChanged(BR.machine);
+         }
+     
+     
+         /**
+         * Gets the User.
+         *
+         * return the User
+         */
+         @Bindable
+         public User getUser()
+         {
+            return user;
+         }
+
+         /**
+         * Sets the User.
+         *
+         * @param user the User
+         */
+         public void setUser(User user)
+         {
+            this.user = user;
+            notifyPropertyChanged(BR.user);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java
index 95d1e8001..4c10d49cd 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java
@@ -1,130 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "MEDIA_COLORS", database = TangoDB.class, cachingEnabled = true)
+public class MediaColor extends MediaColorBase
+{
 
-    @Table(name = "MEDIA_COLORS", database = TangoDB.class)
-    public class MediaColor extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "L")
-            private double l;
-
-    
-    
-            @Column(name = "A")
-            private double a;
-
-    
-    
-            @Column(name = "B")
-            private double b;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the L.
-         *
-         * return the L
-         */
-         @Bindable
-         public double getL()
-         {
-            return l;
-         }
-
-         /**
-         * Sets the L.
-         *
-         * @param l the L
-         */
-         public void setL(double l)
-         {
-            this.l = l;
-            notifyPropertyChanged(BR.l);
-         }
-     
-     
-         /**
-         * Gets the A.
-         *
-         * return the A
-         */
-         @Bindable
-         public double getA()
-         {
-            return a;
-         }
-
-         /**
-         * Sets the A.
-         *
-         * @param a the A
-         */
-         public void setA(double a)
-         {
-            this.a = a;
-            notifyPropertyChanged(BR.a);
-         }
-     
-     
-         /**
-         * Gets the B.
-         *
-         * return the B
-         */
-         @Bindable
-         public double getB()
-         {
-            return b;
-         }
-
-         /**
-         * Sets the B.
-         *
-         * @param b the B
-         */
-         public void setB(double b)
-         {
-            this.b = b;
-            notifyPropertyChanged(BR.b);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColorBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColorBase.java
new file mode 100644
index 000000000..116ebf2a4
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColorBase.java
@@ -0,0 +1,127 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class MediaColorBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "L")
+            private double l;
+
+    
+    
+            @Column(name = "A")
+            private double a;
+
+    
+    
+            @Column(name = "B")
+            private double b;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the L.
+         *
+         * return the L
+         */
+         @Bindable
+         public double getL()
+         {
+            return l;
+         }
+
+         /**
+         * Sets the L.
+         *
+         * @param l the L
+         */
+         public void setL(double l)
+         {
+            this.l = l;
+            notifyPropertyChanged(BR.l);
+         }
+     
+     
+         /**
+         * Gets the A.
+         *
+         * return the A
+         */
+         @Bindable
+         public double getA()
+         {
+            return a;
+         }
+
+         /**
+         * Sets the A.
+         *
+         * @param a the A
+         */
+         public void setA(double a)
+         {
+            this.a = a;
+            notifyPropertyChanged(BR.a);
+         }
+     
+     
+         /**
+         * Gets the B.
+         *
+         * return the B
+         */
+         @Bindable
+         public double getB()
+         {
+            return b;
+         }
+
+         /**
+         * Sets the B.
+         *
+         * @param b the B
+         */
+         public void setB(double b)
+         {
+            this.b = b;
+            notifyPropertyChanged(BR.b);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java
index bf2c00155..5652028eb 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "MEDIA_CONDITIONS", database = TangoDB.class, cachingEnabled = true)
+public class MediaCondition extends MediaConditionBase
+{
 
-    @Table(name = "MEDIA_CONDITIONS", database = TangoDB.class)
-    public class MediaCondition extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaConditionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaConditionBase.java
new file mode 100644
index 000000000..f4aa62c8b
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaConditionBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class MediaConditionBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java
index 532491822..b40c543c8 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "MEDIA_MATERIALS", database = TangoDB.class, cachingEnabled = true)
+public class MediaMaterial extends MediaMaterialBase
+{
 
-    @Table(name = "MEDIA_MATERIALS", database = TangoDB.class)
-    public class MediaMaterial extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterialBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterialBase.java
new file mode 100644
index 000000000..b429f00c9
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterialBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class MediaMaterialBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java
index b7efae74b..086046e00 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "MEDIA_PURPOSES", database = TangoDB.class, cachingEnabled = true)
+public class MediaPurpose extends MediaPurposeBase
+{
 
-    @Table(name = "MEDIA_PURPOSES", database = TangoDB.class)
-    public class MediaPurpose extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurposeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurposeBase.java
new file mode 100644
index 000000000..0113bd234
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurposeBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class MediaPurposeBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java
index 560194702..387c70784 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankType.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "MID_TANK_TYPES", database = TangoDB.class, cachingEnabled = true)
+public class MidTankType extends MidTankTypeBase
+{
 
-    @Table(name = "MID_TANK_TYPES", database = TangoDB.class)
-    public class MidTankType extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "LITER_CAPACITY")
-            private double literCapacity;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the LiterCapacity.
-         *
-         * return the LiterCapacity
-         */
-         @Bindable
-         public double getLiterCapacity()
-         {
-            return literCapacity;
-         }
-
-         /**
-         * Sets the LiterCapacity.
-         *
-         * @param literCapacity the LiterCapacity
-         */
-         public void setLiterCapacity(double literCapacity)
-         {
-            this.literCapacity = literCapacity;
-            notifyPropertyChanged(BR.literCapacity);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankTypeBase.java
new file mode 100644
index 000000000..5aaf29aee
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MidTankTypeBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class MidTankTypeBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "LITER_CAPACITY")
+            private double literCapacity;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the LiterCapacity.
+         *
+         * return the LiterCapacity
+         */
+         @Bindable
+         public double getLiterCapacity()
+         {
+            return literCapacity;
+         }
+
+         /**
+         * Sets the LiterCapacity.
+         *
+         * @param literCapacity the LiterCapacity
+         */
+         public void setLiterCapacity(double literCapacity)
+         {
+            this.literCapacity = literCapacity;
+            notifyPropertyChanged(BR.literCapacity);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java
index 3d1c027fb..50ccd7ecb 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Organization.java
@@ -1,102 +1,34 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
+import com.raizlabs.android.dbflow.sql.language.SQLite;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+import java.util.List;
 
-    @Table(name = "ORGANIZATIONS", database = TangoDB.class)
-    public class Organization extends Entity 
-    {
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "ADDRESS_GUID", foreignKeyColumnName = "GUID")})
-            private Address address;
+import static br.com.zbra.androidlinq.Linq.stream;
 
+@Table(name = "ORGANIZATIONS", database = TangoDB.class, cachingEnabled = true)
+public class Organization extends OrganizationBase
+{
+    public Organization()
+    {
+        super();
+        
+        setContact(new Contact());
+        setAddress(new Address());
+    }
     
+    private List<Machine> machines;
     
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONTACT_GUID", foreignKeyColumnName = "GUID")})
-            private Contact contact;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Address.
-         *
-         * return the Address
-         */
-         @Bindable
-         public Address getAddress()
-         {
-            return address;
-         }
-
-         /**
-         * Sets the Address.
-         *
-         * @param address the Address
-         */
-         public void setAddress(Address address)
-         {
-            this.address = address;
-            notifyPropertyChanged(BR.address);
-         }
-     
-     
-         /**
-         * Gets the Contact.
-         *
-         * return the Contact
-         */
-         @Bindable
-         public Contact getContact()
-         {
-            return contact;
-         }
-
-         /**
-         * Sets the Contact.
-         *
-         * @param contact the Contact
-         */
-         public void setContact(Contact contact)
-         {
-            this.contact = contact;
-            notifyPropertyChanged(BR.contact);
-         }
-     
+    public List<Machine> getMachines()
+    {
+        if (machines == null)
+        {
+            machines = SQLite.select().from(Machine.class).where(Machine_Table.ORGANIZATION_GUID.eq(getGuid())).queryList();
+        }
+        
+        return machines;
     }
+    
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/OrganizationBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/OrganizationBase.java
new file mode 100644
index 000000000..f58b9141f
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/OrganizationBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+
+import org.joda.time.DateTime;
+
+import com.twine.tango.dal.Entity;
+
+import android.databinding.Bindable;
+
+import com.twine.tango.dal.BR;
+
+
+public abstract class OrganizationBase extends Entity
+{
+    
+    @Column(name = "NAME")
+    private String name;
+    
+    
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "ADDRESS_GUID", foreignKeyColumnName = "GUID")})
+    private Address address;
+    
+    
+    @ForeignKey(references = {@ForeignKeyReference(columnName = "CONTACT_GUID", foreignKeyColumnName = "GUID")})
+    private Contact contact;
+    
+    
+    /**
+     * Gets the Name.
+     * <p>
+     * return the Name
+     */
+    @Bindable
+    public String getName()
+    {
+        return name;
+    }
+    
+    /**
+     * Sets the Name.
+     *
+     * @param name the Name
+     */
+    public void setName(String name)
+    {
+        this.name = name;
+        notifyPropertyChanged(BR.name);
+    }
+    
+    
+    /**
+     * Gets the Address.
+     * <p>
+     * return the Address
+     */
+    @Bindable
+    public Address getAddress()
+    {
+        return address;
+    }
+    
+    /**
+     * Sets the Address.
+     *
+     * @param address the Address
+     */
+    public void setAddress(Address address)
+    {
+        this.address = address;
+        notifyPropertyChanged(BR.address);
+    }
+    
+    
+    /**
+     * Gets the Contact.
+     * <p>
+     * return the Contact
+     */
+    @Bindable
+    public Contact getContact()
+    {
+        return contact;
+    }
+    
+    /**
+     * Sets the Contact.
+     *
+     * @param contact the Contact
+     */
+    public void setContact(Contact contact)
+    {
+        this.contact = contact;
+        notifyPropertyChanged(BR.contact);
+    }
+    
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java
index 0ecc361f3..efb19c8fd 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "PERMISSIONS", database = TangoDB.class, cachingEnabled = true)
+public class Permission extends PermissionBase
+{
 
-    @Table(name = "PERMISSIONS", database = TangoDB.class)
-    public class Permission extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/PermissionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/PermissionBase.java
new file mode 100644
index 000000000..ecb650388
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/PermissionBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class PermissionBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java
index 40200fed5..4284ab4d3 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTable.java
@@ -1,522 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "PROCESS_PARAMETERS_TABLES", database = TangoDB.class, cachingEnabled = true)
+public class ProcessParametersTable extends ProcessParametersTableBase
+{
 
-    @Table(name = "PROCESS_PARAMETERS_TABLES", database = TangoDB.class)
-    public class ProcessParametersTable extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DYEING_SPEED")
-            private double dyeingSpeed;
-
-    
-    
-            @Column(name = "MIXER_TEMP")
-            private double mixerTemp;
-
-    
-    
-            @Column(name = "DRYER_BUFFER_LENGTH")
-            private double dryerBufferLength;
-
-    
-    
-            @Column(name = "MIN_INK_UPTAKE")
-            private double minInkUptake;
-
-    
-    
-            @Column(name = "HEAD_ZONE1_TEMP")
-            private double headZone1Temp;
-
-    
-    
-            @Column(name = "DRYER_ZONE1_TEMP")
-            private double dryerZone1Temp;
-
-    
-    
-            @Column(name = "FEEDER_TENSION")
-            private double feederTension;
-
-    
-    
-            @Column(name = "DRYER_ZONE2_TEMP")
-            private double dryerZone2Temp;
-
-    
-    
-            @Column(name = "HEAD_ZONE2_TEMP")
-            private double headZone2Temp;
-
-    
-    
-            @Column(name = "PULLER_TENSION")
-            private double pullerTension;
-
-    
-    
-            @Column(name = "HEAD_ZONE3_TEMP")
-            private double headZone3Temp;
-
-    
-    
-            @Column(name = "DRYER_ZONE3_TEMP")
-            private double dryerZone3Temp;
-
-    
-    
-            @Column(name = "WINDER_TENSION")
-            private double winderTension;
-
-    
-    
-            @Column(name = "HEAD_AIR_FLOW")
-            private double headAirFlow;
-
-    
-    
-            @Column(name = "DRYER_AIR_FLOW")
-            private double dryerAirFlow;
-
-    
-    
-            @Column(name = "TABLE_INDEX")
-            private int tableIndex;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "PROCESS_PARAMETERS_TABLES_GROUPS_GUID", foreignKeyColumnName = "GUID")})
-            private ProcessParametersTablesGroup processParametersTablesGroups;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the DyeingSpeed.
-         *
-         * return the DyeingSpeed
-         */
-         @Bindable
-         public double getDyeingSpeed()
-         {
-            return dyeingSpeed;
-         }
-
-         /**
-         * Sets the DyeingSpeed.
-         *
-         * @param dyeingSpeed the DyeingSpeed
-         */
-         public void setDyeingSpeed(double dyeingSpeed)
-         {
-            this.dyeingSpeed = dyeingSpeed;
-            notifyPropertyChanged(BR.dyeingSpeed);
-         }
-     
-     
-         /**
-         * Gets the MixerTemp.
-         *
-         * return the MixerTemp
-         */
-         @Bindable
-         public double getMixerTemp()
-         {
-            return mixerTemp;
-         }
-
-         /**
-         * Sets the MixerTemp.
-         *
-         * @param mixerTemp the MixerTemp
-         */
-         public void setMixerTemp(double mixerTemp)
-         {
-            this.mixerTemp = mixerTemp;
-            notifyPropertyChanged(BR.mixerTemp);
-         }
-     
-     
-         /**
-         * Gets the DryerBufferLength.
-         *
-         * return the DryerBufferLength
-         */
-         @Bindable
-         public double getDryerBufferLength()
-         {
-            return dryerBufferLength;
-         }
-
-         /**
-         * Sets the DryerBufferLength.
-         *
-         * @param dryerBufferLength the DryerBufferLength
-         */
-         public void setDryerBufferLength(double dryerBufferLength)
-         {
-            this.dryerBufferLength = dryerBufferLength;
-            notifyPropertyChanged(BR.dryerBufferLength);
-         }
-     
-     
-         /**
-         * Gets the MinInkUptake.
-         *
-         * return the MinInkUptake
-         */
-         @Bindable
-         public double getMinInkUptake()
-         {
-            return minInkUptake;
-         }
-
-         /**
-         * Sets the MinInkUptake.
-         *
-         * @param minInkUptake the MinInkUptake
-         */
-         public void setMinInkUptake(double minInkUptake)
-         {
-            this.minInkUptake = minInkUptake;
-            notifyPropertyChanged(BR.minInkUptake);
-         }
-     
-     
-         /**
-         * Gets the HeadZone1Temp.
-         *
-         * return the HeadZone1Temp
-         */
-         @Bindable
-         public double getHeadZone1Temp()
-         {
-            return headZone1Temp;
-         }
-
-         /**
-         * Sets the HeadZone1Temp.
-         *
-         * @param headZone1Temp the HeadZone1Temp
-         */
-         public void setHeadZone1Temp(double headZone1Temp)
-         {
-            this.headZone1Temp = headZone1Temp;
-            notifyPropertyChanged(BR.headZone1Temp);
-         }
-     
-     
-         /**
-         * Gets the DryerZone1Temp.
-         *
-         * return the DryerZone1Temp
-         */
-         @Bindable
-         public double getDryerZone1Temp()
-         {
-            return dryerZone1Temp;
-         }
-
-         /**
-         * Sets the DryerZone1Temp.
-         *
-         * @param dryerZone1Temp the DryerZone1Temp
-         */
-         public void setDryerZone1Temp(double dryerZone1Temp)
-         {
-            this.dryerZone1Temp = dryerZone1Temp;
-            notifyPropertyChanged(BR.dryerZone1Temp);
-         }
-     
-     
-         /**
-         * Gets the FeederTension.
-         *
-         * return the FeederTension
-         */
-         @Bindable
-         public double getFeederTension()
-         {
-            return feederTension;
-         }
-
-         /**
-         * Sets the FeederTension.
-         *
-         * @param feederTension the FeederTension
-         */
-         public void setFeederTension(double feederTension)
-         {
-            this.feederTension = feederTension;
-            notifyPropertyChanged(BR.feederTension);
-         }
-     
-     
-         /**
-         * Gets the DryerZone2Temp.
-         *
-         * return the DryerZone2Temp
-         */
-         @Bindable
-         public double getDryerZone2Temp()
-         {
-            return dryerZone2Temp;
-         }
-
-         /**
-         * Sets the DryerZone2Temp.
-         *
-         * @param dryerZone2Temp the DryerZone2Temp
-         */
-         public void setDryerZone2Temp(double dryerZone2Temp)
-         {
-            this.dryerZone2Temp = dryerZone2Temp;
-            notifyPropertyChanged(BR.dryerZone2Temp);
-         }
-     
-     
-         /**
-         * Gets the HeadZone2Temp.
-         *
-         * return the HeadZone2Temp
-         */
-         @Bindable
-         public double getHeadZone2Temp()
-         {
-            return headZone2Temp;
-         }
-
-         /**
-         * Sets the HeadZone2Temp.
-         *
-         * @param headZone2Temp the HeadZone2Temp
-         */
-         public void setHeadZone2Temp(double headZone2Temp)
-         {
-            this.headZone2Temp = headZone2Temp;
-            notifyPropertyChanged(BR.headZone2Temp);
-         }
-     
-     
-         /**
-         * Gets the PullerTension.
-         *
-         * return the PullerTension
-         */
-         @Bindable
-         public double getPullerTension()
-         {
-            return pullerTension;
-         }
-
-         /**
-         * Sets the PullerTension.
-         *
-         * @param pullerTension the PullerTension
-         */
-         public void setPullerTension(double pullerTension)
-         {
-            this.pullerTension = pullerTension;
-            notifyPropertyChanged(BR.pullerTension);
-         }
-     
-     
-         /**
-         * Gets the HeadZone3Temp.
-         *
-         * return the HeadZone3Temp
-         */
-         @Bindable
-         public double getHeadZone3Temp()
-         {
-            return headZone3Temp;
-         }
-
-         /**
-         * Sets the HeadZone3Temp.
-         *
-         * @param headZone3Temp the HeadZone3Temp
-         */
-         public void setHeadZone3Temp(double headZone3Temp)
-         {
-            this.headZone3Temp = headZone3Temp;
-            notifyPropertyChanged(BR.headZone3Temp);
-         }
-     
-     
-         /**
-         * Gets the DryerZone3Temp.
-         *
-         * return the DryerZone3Temp
-         */
-         @Bindable
-         public double getDryerZone3Temp()
-         {
-            return dryerZone3Temp;
-         }
-
-         /**
-         * Sets the DryerZone3Temp.
-         *
-         * @param dryerZone3Temp the DryerZone3Temp
-         */
-         public void setDryerZone3Temp(double dryerZone3Temp)
-         {
-            this.dryerZone3Temp = dryerZone3Temp;
-            notifyPropertyChanged(BR.dryerZone3Temp);
-         }
-     
-     
-         /**
-         * Gets the WinderTension.
-         *
-         * return the WinderTension
-         */
-         @Bindable
-         public double getWinderTension()
-         {
-            return winderTension;
-         }
-
-         /**
-         * Sets the WinderTension.
-         *
-         * @param winderTension the WinderTension
-         */
-         public void setWinderTension(double winderTension)
-         {
-            this.winderTension = winderTension;
-            notifyPropertyChanged(BR.winderTension);
-         }
-     
-     
-         /**
-         * Gets the HeadAirFlow.
-         *
-         * return the HeadAirFlow
-         */
-         @Bindable
-         public double getHeadAirFlow()
-         {
-            return headAirFlow;
-         }
-
-         /**
-         * Sets the HeadAirFlow.
-         *
-         * @param headAirFlow the HeadAirFlow
-         */
-         public void setHeadAirFlow(double headAirFlow)
-         {
-            this.headAirFlow = headAirFlow;
-            notifyPropertyChanged(BR.headAirFlow);
-         }
-     
-     
-         /**
-         * Gets the DryerAirFlow.
-         *
-         * return the DryerAirFlow
-         */
-         @Bindable
-         public double getDryerAirFlow()
-         {
-            return dryerAirFlow;
-         }
-
-         /**
-         * Sets the DryerAirFlow.
-         *
-         * @param dryerAirFlow the DryerAirFlow
-         */
-         public void setDryerAirFlow(double dryerAirFlow)
-         {
-            this.dryerAirFlow = dryerAirFlow;
-            notifyPropertyChanged(BR.dryerAirFlow);
-         }
-     
-     
-         /**
-         * Gets the TableIndex.
-         *
-         * return the TableIndex
-         */
-         @Bindable
-         public int getTableIndex()
-         {
-            return tableIndex;
-         }
-
-         /**
-         * Sets the TableIndex.
-         *
-         * @param tableIndex the TableIndex
-         */
-         public void setTableIndex(int tableIndex)
-         {
-            this.tableIndex = tableIndex;
-            notifyPropertyChanged(BR.tableIndex);
-         }
-     
-     
-         /**
-         * Gets the ProcessParametersTablesGroups.
-         *
-         * return the ProcessParametersTablesGroups
-         */
-         @Bindable
-         public ProcessParametersTablesGroup getProcessParametersTablesGroups()
-         {
-            return processParametersTablesGroups;
-         }
-
-         /**
-         * Sets the ProcessParametersTablesGroups.
-         *
-         * @param processParametersTablesGroups the ProcessParametersTablesGroups
-         */
-         public void setProcessParametersTablesGroups(ProcessParametersTablesGroup processParametersTablesGroups)
-         {
-            this.processParametersTablesGroups = processParametersTablesGroups;
-            notifyPropertyChanged(BR.processParametersTablesGroups);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTableBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTableBase.java
new file mode 100644
index 000000000..a1ad71938
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTableBase.java
@@ -0,0 +1,519 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class ProcessParametersTableBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DYEING_SPEED")
+            private double dyeingSpeed;
+
+    
+    
+            @Column(name = "MIXER_TEMP")
+            private double mixerTemp;
+
+    
+    
+            @Column(name = "DRYER_BUFFER_LENGTH")
+            private double dryerBufferLength;
+
+    
+    
+            @Column(name = "MIN_INK_UPTAKE")
+            private double minInkUptake;
+
+    
+    
+            @Column(name = "HEAD_ZONE1_TEMP")
+            private double headZone1Temp;
+
+    
+    
+            @Column(name = "DRYER_ZONE1_TEMP")
+            private double dryerZone1Temp;
+
+    
+    
+            @Column(name = "FEEDER_TENSION")
+            private double feederTension;
+
+    
+    
+            @Column(name = "DRYER_ZONE2_TEMP")
+            private double dryerZone2Temp;
+
+    
+    
+            @Column(name = "HEAD_ZONE2_TEMP")
+            private double headZone2Temp;
+
+    
+    
+            @Column(name = "PULLER_TENSION")
+            private double pullerTension;
+
+    
+    
+            @Column(name = "HEAD_ZONE3_TEMP")
+            private double headZone3Temp;
+
+    
+    
+            @Column(name = "DRYER_ZONE3_TEMP")
+            private double dryerZone3Temp;
+
+    
+    
+            @Column(name = "WINDER_TENSION")
+            private double winderTension;
+
+    
+    
+            @Column(name = "HEAD_AIR_FLOW")
+            private double headAirFlow;
+
+    
+    
+            @Column(name = "DRYER_AIR_FLOW")
+            private double dryerAirFlow;
+
+    
+    
+            @Column(name = "TABLE_INDEX")
+            private int tableIndex;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "PROCESS_PARAMETERS_TABLES_GROUP_GUID", foreignKeyColumnName = "GUID")})
+            private ProcessParametersTablesGroup processParametersTablesGroup;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the DyeingSpeed.
+         *
+         * return the DyeingSpeed
+         */
+         @Bindable
+         public double getDyeingSpeed()
+         {
+            return dyeingSpeed;
+         }
+
+         /**
+         * Sets the DyeingSpeed.
+         *
+         * @param dyeingSpeed the DyeingSpeed
+         */
+         public void setDyeingSpeed(double dyeingSpeed)
+         {
+            this.dyeingSpeed = dyeingSpeed;
+            notifyPropertyChanged(BR.dyeingSpeed);
+         }
+     
+     
+         /**
+         * Gets the MixerTemp.
+         *
+         * return the MixerTemp
+         */
+         @Bindable
+         public double getMixerTemp()
+         {
+            return mixerTemp;
+         }
+
+         /**
+         * Sets the MixerTemp.
+         *
+         * @param mixerTemp the MixerTemp
+         */
+         public void setMixerTemp(double mixerTemp)
+         {
+            this.mixerTemp = mixerTemp;
+            notifyPropertyChanged(BR.mixerTemp);
+         }
+     
+     
+         /**
+         * Gets the DryerBufferLength.
+         *
+         * return the DryerBufferLength
+         */
+         @Bindable
+         public double getDryerBufferLength()
+         {
+            return dryerBufferLength;
+         }
+
+         /**
+         * Sets the DryerBufferLength.
+         *
+         * @param dryerBufferLength the DryerBufferLength
+         */
+         public void setDryerBufferLength(double dryerBufferLength)
+         {
+            this.dryerBufferLength = dryerBufferLength;
+            notifyPropertyChanged(BR.dryerBufferLength);
+         }
+     
+     
+         /**
+         * Gets the MinInkUptake.
+         *
+         * return the MinInkUptake
+         */
+         @Bindable
+         public double getMinInkUptake()
+         {
+            return minInkUptake;
+         }
+
+         /**
+         * Sets the MinInkUptake.
+         *
+         * @param minInkUptake the MinInkUptake
+         */
+         public void setMinInkUptake(double minInkUptake)
+         {
+            this.minInkUptake = minInkUptake;
+            notifyPropertyChanged(BR.minInkUptake);
+         }
+     
+     
+         /**
+         * Gets the HeadZone1Temp.
+         *
+         * return the HeadZone1Temp
+         */
+         @Bindable
+         public double getHeadZone1Temp()
+         {
+            return headZone1Temp;
+         }
+
+         /**
+         * Sets the HeadZone1Temp.
+         *
+         * @param headZone1Temp the HeadZone1Temp
+         */
+         public void setHeadZone1Temp(double headZone1Temp)
+         {
+            this.headZone1Temp = headZone1Temp;
+            notifyPropertyChanged(BR.headZone1Temp);
+         }
+     
+     
+         /**
+         * Gets the DryerZone1Temp.
+         *
+         * return the DryerZone1Temp
+         */
+         @Bindable
+         public double getDryerZone1Temp()
+         {
+            return dryerZone1Temp;
+         }
+
+         /**
+         * Sets the DryerZone1Temp.
+         *
+         * @param dryerZone1Temp the DryerZone1Temp
+         */
+         public void setDryerZone1Temp(double dryerZone1Temp)
+         {
+            this.dryerZone1Temp = dryerZone1Temp;
+            notifyPropertyChanged(BR.dryerZone1Temp);
+         }
+     
+     
+         /**
+         * Gets the FeederTension.
+         *
+         * return the FeederTension
+         */
+         @Bindable
+         public double getFeederTension()
+         {
+            return feederTension;
+         }
+
+         /**
+         * Sets the FeederTension.
+         *
+         * @param feederTension the FeederTension
+         */
+         public void setFeederTension(double feederTension)
+         {
+            this.feederTension = feederTension;
+            notifyPropertyChanged(BR.feederTension);
+         }
+     
+     
+         /**
+         * Gets the DryerZone2Temp.
+         *
+         * return the DryerZone2Temp
+         */
+         @Bindable
+         public double getDryerZone2Temp()
+         {
+            return dryerZone2Temp;
+         }
+
+         /**
+         * Sets the DryerZone2Temp.
+         *
+         * @param dryerZone2Temp the DryerZone2Temp
+         */
+         public void setDryerZone2Temp(double dryerZone2Temp)
+         {
+            this.dryerZone2Temp = dryerZone2Temp;
+            notifyPropertyChanged(BR.dryerZone2Temp);
+         }
+     
+     
+         /**
+         * Gets the HeadZone2Temp.
+         *
+         * return the HeadZone2Temp
+         */
+         @Bindable
+         public double getHeadZone2Temp()
+         {
+            return headZone2Temp;
+         }
+
+         /**
+         * Sets the HeadZone2Temp.
+         *
+         * @param headZone2Temp the HeadZone2Temp
+         */
+         public void setHeadZone2Temp(double headZone2Temp)
+         {
+            this.headZone2Temp = headZone2Temp;
+            notifyPropertyChanged(BR.headZone2Temp);
+         }
+     
+     
+         /**
+         * Gets the PullerTension.
+         *
+         * return the PullerTension
+         */
+         @Bindable
+         public double getPullerTension()
+         {
+            return pullerTension;
+         }
+
+         /**
+         * Sets the PullerTension.
+         *
+         * @param pullerTension the PullerTension
+         */
+         public void setPullerTension(double pullerTension)
+         {
+            this.pullerTension = pullerTension;
+            notifyPropertyChanged(BR.pullerTension);
+         }
+     
+     
+         /**
+         * Gets the HeadZone3Temp.
+         *
+         * return the HeadZone3Temp
+         */
+         @Bindable
+         public double getHeadZone3Temp()
+         {
+            return headZone3Temp;
+         }
+
+         /**
+         * Sets the HeadZone3Temp.
+         *
+         * @param headZone3Temp the HeadZone3Temp
+         */
+         public void setHeadZone3Temp(double headZone3Temp)
+         {
+            this.headZone3Temp = headZone3Temp;
+            notifyPropertyChanged(BR.headZone3Temp);
+         }
+     
+     
+         /**
+         * Gets the DryerZone3Temp.
+         *
+         * return the DryerZone3Temp
+         */
+         @Bindable
+         public double getDryerZone3Temp()
+         {
+            return dryerZone3Temp;
+         }
+
+         /**
+         * Sets the DryerZone3Temp.
+         *
+         * @param dryerZone3Temp the DryerZone3Temp
+         */
+         public void setDryerZone3Temp(double dryerZone3Temp)
+         {
+            this.dryerZone3Temp = dryerZone3Temp;
+            notifyPropertyChanged(BR.dryerZone3Temp);
+         }
+     
+     
+         /**
+         * Gets the WinderTension.
+         *
+         * return the WinderTension
+         */
+         @Bindable
+         public double getWinderTension()
+         {
+            return winderTension;
+         }
+
+         /**
+         * Sets the WinderTension.
+         *
+         * @param winderTension the WinderTension
+         */
+         public void setWinderTension(double winderTension)
+         {
+            this.winderTension = winderTension;
+            notifyPropertyChanged(BR.winderTension);
+         }
+     
+     
+         /**
+         * Gets the HeadAirFlow.
+         *
+         * return the HeadAirFlow
+         */
+         @Bindable
+         public double getHeadAirFlow()
+         {
+            return headAirFlow;
+         }
+
+         /**
+         * Sets the HeadAirFlow.
+         *
+         * @param headAirFlow the HeadAirFlow
+         */
+         public void setHeadAirFlow(double headAirFlow)
+         {
+            this.headAirFlow = headAirFlow;
+            notifyPropertyChanged(BR.headAirFlow);
+         }
+     
+     
+         /**
+         * Gets the DryerAirFlow.
+         *
+         * return the DryerAirFlow
+         */
+         @Bindable
+         public double getDryerAirFlow()
+         {
+            return dryerAirFlow;
+         }
+
+         /**
+         * Sets the DryerAirFlow.
+         *
+         * @param dryerAirFlow the DryerAirFlow
+         */
+         public void setDryerAirFlow(double dryerAirFlow)
+         {
+            this.dryerAirFlow = dryerAirFlow;
+            notifyPropertyChanged(BR.dryerAirFlow);
+         }
+     
+     
+         /**
+         * Gets the TableIndex.
+         *
+         * return the TableIndex
+         */
+         @Bindable
+         public int getTableIndex()
+         {
+            return tableIndex;
+         }
+
+         /**
+         * Sets the TableIndex.
+         *
+         * @param tableIndex the TableIndex
+         */
+         public void setTableIndex(int tableIndex)
+         {
+            this.tableIndex = tableIndex;
+            notifyPropertyChanged(BR.tableIndex);
+         }
+     
+     
+         /**
+         * Gets the ProcessParametersTablesGroup.
+         *
+         * return the ProcessParametersTablesGroup
+         */
+         @Bindable
+         public ProcessParametersTablesGroup getProcessParametersTablesGroup()
+         {
+            return processParametersTablesGroup;
+         }
+
+         /**
+         * Sets the ProcessParametersTablesGroup.
+         *
+         * @param processParametersTablesGroup the ProcessParametersTablesGroup
+         */
+         public void setProcessParametersTablesGroup(ProcessParametersTablesGroup processParametersTablesGroup)
+         {
+            this.processParametersTablesGroup = processParametersTablesGroup;
+            notifyPropertyChanged(BR.processParametersTablesGroup);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java
index bed5eb05e..4652a0b1f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroup.java
@@ -1,130 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "PROCESS_PARAMETERS_TABLES_GROUPS", database = TangoDB.class, cachingEnabled = true)
+public class ProcessParametersTablesGroup extends ProcessParametersTablesGroupBase
+{
 
-    @Table(name = "PROCESS_PARAMETERS_TABLES_GROUPS", database = TangoDB.class)
-    public class ProcessParametersTablesGroup extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "ACTIVE")
-            private boolean active;
-
-    
-    
-            @Column(name = "SAVE_DATE")
-            private DateTime saveDate;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
-            private Rml rml;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Active.
-         *
-         * return the Active
-         */
-         @Bindable
-         public boolean isActive()
-         {
-            return active;
-         }
-
-         /**
-         * Sets the Active.
-         *
-         * @param active the Active
-         */
-         public void setActive(boolean active)
-         {
-            this.active = active;
-            notifyPropertyChanged(BR.active);
-         }
-     
-     
-         /**
-         * Gets the SaveDate.
-         *
-         * return the SaveDate
-         */
-         @Bindable
-         public DateTime getSaveDate()
-         {
-            return saveDate;
-         }
-
-         /**
-         * Sets the SaveDate.
-         *
-         * @param saveDate the SaveDate
-         */
-         public void setSaveDate(DateTime saveDate)
-         {
-            this.saveDate = saveDate;
-            notifyPropertyChanged(BR.saveDate);
-         }
-     
-     
-         /**
-         * Gets the Rml.
-         *
-         * return the Rml
-         */
-         @Bindable
-         public Rml getRml()
-         {
-            return rml;
-         }
-
-         /**
-         * Sets the Rml.
-         *
-         * @param rml the Rml
-         */
-         public void setRml(Rml rml)
-         {
-            this.rml = rml;
-            notifyPropertyChanged(BR.rml);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroupBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroupBase.java
new file mode 100644
index 000000000..c7c9c561e
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ProcessParametersTablesGroupBase.java
@@ -0,0 +1,127 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class ProcessParametersTablesGroupBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "ACTIVE")
+            private boolean active;
+
+    
+    
+            @Column(name = "SAVE_DATE")
+            private DateTime saveDate;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
+            private Rml rml;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Active.
+         *
+         * return the Active
+         */
+         @Bindable
+         public boolean isActive()
+         {
+            return active;
+         }
+
+         /**
+         * Sets the Active.
+         *
+         * @param active the Active
+         */
+         public void setActive(boolean active)
+         {
+            this.active = active;
+            notifyPropertyChanged(BR.active);
+         }
+     
+     
+         /**
+         * Gets the SaveDate.
+         *
+         * return the SaveDate
+         */
+         @Bindable
+         public DateTime getSaveDate()
+         {
+            return saveDate;
+         }
+
+         /**
+         * Sets the SaveDate.
+         *
+         * @param saveDate the SaveDate
+         */
+         public void setSaveDate(DateTime saveDate)
+         {
+            this.saveDate = saveDate;
+            notifyPropertyChanged(BR.saveDate);
+         }
+     
+     
+         /**
+         * Gets the Rml.
+         *
+         * return the Rml
+         */
+         @Bindable
+         public Rml getRml()
+         {
+            return rml;
+         }
+
+         /**
+         * Sets the Rml.
+         *
+         * @param rml the Rml
+         */
+         public void setRml(Rml rml)
+         {
+            this.rml = rml;
+            notifyPropertyChanged(BR.rml);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java
index e0116628f..f22a991bb 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java
@@ -1,578 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "RMLS", database = TangoDB.class, cachingEnabled = true)
+public class Rml extends RmlBase
+{
 
-    @Table(name = "RMLS", database = TangoDB.class)
-    public class Rml extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "MANUFACTURER")
-            private String manufacturer;
-
-    
-    
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "FIBER_SIZE")
-            private double fiberSize;
-
-    
-    
-            @Column(name = "NUMBER_OF_FIBERS")
-            private int numberOfFibers;
-
-    
-    
-            @Column(name = "PLIES_PER_FIBER")
-            private int pliesPerFiber;
-
-    
-    
-            @Column(name = "PLIES_PER_THREAD")
-            private int pliesPerThread;
-
-    
-    
-            @Column(name = "TWISTED")
-            private boolean twisted;
-
-    
-    
-            @Column(name = "AIR_ENTANGLEMENT")
-            private boolean airEntanglement;
-
-    
-    
-            @Column(name = "LUBRICANT")
-            private boolean lubricant;
-
-    
-    
-            @Column(name = "TENSILE_STRENGTH")
-            private double tensileStrength;
-
-    
-    
-            @Column(name = "ELONGATION_AT_BREAK_PERCENTAGE")
-            private double elongationAtBreakPercentage;
-
-    
-    
-            @Column(name = "ESTIMATED_THREAD_DIAMETER")
-            private double estimatedThreadDiameter;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "FIBER_SHAPES_GUID", foreignKeyColumnName = "GUID")})
-            private FiberShape fiberShapes;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "FIBER_SYNTHS_GUID", foreignKeyColumnName = "GUID")})
-            private FiberSynth fiberSynths;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "LINEAR_MASS_DENSITY_UNITS_GUID", foreignKeyColumnName = "GUID")})
-            private LinearMassDensityUnit linearMassDensityUnits;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_COLORS_GUID", foreignKeyColumnName = "GUID")})
-            private MediaColor mediaColors;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_CONDITIONS_GUID", foreignKeyColumnName = "GUID")})
-            private MediaCondition mediaConditions;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_MATERIALS_GUID", foreignKeyColumnName = "GUID")})
-            private MediaMaterial mediaMaterials;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_PURPOSES_GUID", foreignKeyColumnName = "GUID")})
-            private MediaPurpose mediaPurposes;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Manufacturer.
-         *
-         * return the Manufacturer
-         */
-         @Bindable
-         public String getManufacturer()
-         {
-            return manufacturer;
-         }
-
-         /**
-         * Sets the Manufacturer.
-         *
-         * @param manufacturer the Manufacturer
-         */
-         public void setManufacturer(String manufacturer)
-         {
-            this.manufacturer = manufacturer;
-            notifyPropertyChanged(BR.manufacturer);
-         }
-     
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the FiberSize.
-         *
-         * return the FiberSize
-         */
-         @Bindable
-         public double getFiberSize()
-         {
-            return fiberSize;
-         }
-
-         /**
-         * Sets the FiberSize.
-         *
-         * @param fiberSize the FiberSize
-         */
-         public void setFiberSize(double fiberSize)
-         {
-            this.fiberSize = fiberSize;
-            notifyPropertyChanged(BR.fiberSize);
-         }
-     
-     
-         /**
-         * Gets the NumberOfFibers.
-         *
-         * return the NumberOfFibers
-         */
-         @Bindable
-         public int getNumberOfFibers()
-         {
-            return numberOfFibers;
-         }
-
-         /**
-         * Sets the NumberOfFibers.
-         *
-         * @param numberOfFibers the NumberOfFibers
-         */
-         public void setNumberOfFibers(int numberOfFibers)
-         {
-            this.numberOfFibers = numberOfFibers;
-            notifyPropertyChanged(BR.numberOfFibers);
-         }
-     
-     
-         /**
-         * Gets the PliesPerFiber.
-         *
-         * return the PliesPerFiber
-         */
-         @Bindable
-         public int getPliesPerFiber()
-         {
-            return pliesPerFiber;
-         }
-
-         /**
-         * Sets the PliesPerFiber.
-         *
-         * @param pliesPerFiber the PliesPerFiber
-         */
-         public void setPliesPerFiber(int pliesPerFiber)
-         {
-            this.pliesPerFiber = pliesPerFiber;
-            notifyPropertyChanged(BR.pliesPerFiber);
-         }
-     
-     
-         /**
-         * Gets the PliesPerThread.
-         *
-         * return the PliesPerThread
-         */
-         @Bindable
-         public int getPliesPerThread()
-         {
-            return pliesPerThread;
-         }
-
-         /**
-         * Sets the PliesPerThread.
-         *
-         * @param pliesPerThread the PliesPerThread
-         */
-         public void setPliesPerThread(int pliesPerThread)
-         {
-            this.pliesPerThread = pliesPerThread;
-            notifyPropertyChanged(BR.pliesPerThread);
-         }
-     
-     
-         /**
-         * Gets the Twisted.
-         *
-         * return the Twisted
-         */
-         @Bindable
-         public boolean isTwisted()
-         {
-            return twisted;
-         }
-
-         /**
-         * Sets the Twisted.
-         *
-         * @param twisted the Twisted
-         */
-         public void setTwisted(boolean twisted)
-         {
-            this.twisted = twisted;
-            notifyPropertyChanged(BR.twisted);
-         }
-     
-     
-         /**
-         * Gets the AirEntanglement.
-         *
-         * return the AirEntanglement
-         */
-         @Bindable
-         public boolean isAirEntanglement()
-         {
-            return airEntanglement;
-         }
-
-         /**
-         * Sets the AirEntanglement.
-         *
-         * @param airEntanglement the AirEntanglement
-         */
-         public void setAirEntanglement(boolean airEntanglement)
-         {
-            this.airEntanglement = airEntanglement;
-            notifyPropertyChanged(BR.airEntanglement);
-         }
-     
-     
-         /**
-         * Gets the Lubricant.
-         *
-         * return the Lubricant
-         */
-         @Bindable
-         public boolean isLubricant()
-         {
-            return lubricant;
-         }
-
-         /**
-         * Sets the Lubricant.
-         *
-         * @param lubricant the Lubricant
-         */
-         public void setLubricant(boolean lubricant)
-         {
-            this.lubricant = lubricant;
-            notifyPropertyChanged(BR.lubricant);
-         }
-     
-     
-         /**
-         * Gets the TensileStrength.
-         *
-         * return the TensileStrength
-         */
-         @Bindable
-         public double getTensileStrength()
-         {
-            return tensileStrength;
-         }
-
-         /**
-         * Sets the TensileStrength.
-         *
-         * @param tensileStrength the TensileStrength
-         */
-         public void setTensileStrength(double tensileStrength)
-         {
-            this.tensileStrength = tensileStrength;
-            notifyPropertyChanged(BR.tensileStrength);
-         }
-     
-     
-         /**
-         * Gets the ElongationAtBreakPercentage.
-         *
-         * return the ElongationAtBreakPercentage
-         */
-         @Bindable
-         public double getElongationAtBreakPercentage()
-         {
-            return elongationAtBreakPercentage;
-         }
-
-         /**
-         * Sets the ElongationAtBreakPercentage.
-         *
-         * @param elongationAtBreakPercentage the ElongationAtBreakPercentage
-         */
-         public void setElongationAtBreakPercentage(double elongationAtBreakPercentage)
-         {
-            this.elongationAtBreakPercentage = elongationAtBreakPercentage;
-            notifyPropertyChanged(BR.elongationAtBreakPercentage);
-         }
-     
-     
-         /**
-         * Gets the EstimatedThreadDiameter.
-         *
-         * return the EstimatedThreadDiameter
-         */
-         @Bindable
-         public double getEstimatedThreadDiameter()
-         {
-            return estimatedThreadDiameter;
-         }
-
-         /**
-         * Sets the EstimatedThreadDiameter.
-         *
-         * @param estimatedThreadDiameter the EstimatedThreadDiameter
-         */
-         public void setEstimatedThreadDiameter(double estimatedThreadDiameter)
-         {
-            this.estimatedThreadDiameter = estimatedThreadDiameter;
-            notifyPropertyChanged(BR.estimatedThreadDiameter);
-         }
-     
-     
-         /**
-         * Gets the FiberShapes.
-         *
-         * return the FiberShapes
-         */
-         @Bindable
-         public FiberShape getFiberShapes()
-         {
-            return fiberShapes;
-         }
-
-         /**
-         * Sets the FiberShapes.
-         *
-         * @param fiberShapes the FiberShapes
-         */
-         public void setFiberShapes(FiberShape fiberShapes)
-         {
-            this.fiberShapes = fiberShapes;
-            notifyPropertyChanged(BR.fiberShapes);
-         }
-     
-     
-         /**
-         * Gets the FiberSynths.
-         *
-         * return the FiberSynths
-         */
-         @Bindable
-         public FiberSynth getFiberSynths()
-         {
-            return fiberSynths;
-         }
-
-         /**
-         * Sets the FiberSynths.
-         *
-         * @param fiberSynths the FiberSynths
-         */
-         public void setFiberSynths(FiberSynth fiberSynths)
-         {
-            this.fiberSynths = fiberSynths;
-            notifyPropertyChanged(BR.fiberSynths);
-         }
-     
-     
-         /**
-         * Gets the LinearMassDensityUnits.
-         *
-         * return the LinearMassDensityUnits
-         */
-         @Bindable
-         public LinearMassDensityUnit getLinearMassDensityUnits()
-         {
-            return linearMassDensityUnits;
-         }
-
-         /**
-         * Sets the LinearMassDensityUnits.
-         *
-         * @param linearMassDensityUnits the LinearMassDensityUnits
-         */
-         public void setLinearMassDensityUnits(LinearMassDensityUnit linearMassDensityUnits)
-         {
-            this.linearMassDensityUnits = linearMassDensityUnits;
-            notifyPropertyChanged(BR.linearMassDensityUnits);
-         }
-     
-     
-         /**
-         * Gets the MediaColors.
-         *
-         * return the MediaColors
-         */
-         @Bindable
-         public MediaColor getMediaColors()
-         {
-            return mediaColors;
-         }
-
-         /**
-         * Sets the MediaColors.
-         *
-         * @param mediaColors the MediaColors
-         */
-         public void setMediaColors(MediaColor mediaColors)
-         {
-            this.mediaColors = mediaColors;
-            notifyPropertyChanged(BR.mediaColors);
-         }
-     
-     
-         /**
-         * Gets the MediaConditions.
-         *
-         * return the MediaConditions
-         */
-         @Bindable
-         public MediaCondition getMediaConditions()
-         {
-            return mediaConditions;
-         }
-
-         /**
-         * Sets the MediaConditions.
-         *
-         * @param mediaConditions the MediaConditions
-         */
-         public void setMediaConditions(MediaCondition mediaConditions)
-         {
-            this.mediaConditions = mediaConditions;
-            notifyPropertyChanged(BR.mediaConditions);
-         }
-     
-     
-         /**
-         * Gets the MediaMaterials.
-         *
-         * return the MediaMaterials
-         */
-         @Bindable
-         public MediaMaterial getMediaMaterials()
-         {
-            return mediaMaterials;
-         }
-
-         /**
-         * Sets the MediaMaterials.
-         *
-         * @param mediaMaterials the MediaMaterials
-         */
-         public void setMediaMaterials(MediaMaterial mediaMaterials)
-         {
-            this.mediaMaterials = mediaMaterials;
-            notifyPropertyChanged(BR.mediaMaterials);
-         }
-     
-     
-         /**
-         * Gets the MediaPurposes.
-         *
-         * return the MediaPurposes
-         */
-         @Bindable
-         public MediaPurpose getMediaPurposes()
-         {
-            return mediaPurposes;
-         }
-
-         /**
-         * Sets the MediaPurposes.
-         *
-         * @param mediaPurposes the MediaPurposes
-         */
-         public void setMediaPurposes(MediaPurpose mediaPurposes)
-         {
-            this.mediaPurposes = mediaPurposes;
-            notifyPropertyChanged(BR.mediaPurposes);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RmlBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RmlBase.java
new file mode 100644
index 000000000..f3c24d0ae
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RmlBase.java
@@ -0,0 +1,575 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class RmlBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "MANUFACTURER")
+            private String manufacturer;
+
+    
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "FIBER_SIZE")
+            private double fiberSize;
+
+    
+    
+            @Column(name = "NUMBER_OF_FIBERS")
+            private int numberOfFibers;
+
+    
+    
+            @Column(name = "PLIES_PER_FIBER")
+            private int pliesPerFiber;
+
+    
+    
+            @Column(name = "PLIES_PER_THREAD")
+            private int pliesPerThread;
+
+    
+    
+            @Column(name = "TWISTED")
+            private boolean twisted;
+
+    
+    
+            @Column(name = "AIR_ENTANGLEMENT")
+            private boolean airEntanglement;
+
+    
+    
+            @Column(name = "LUBRICANT")
+            private boolean lubricant;
+
+    
+    
+            @Column(name = "TENSILE_STRENGTH")
+            private double tensileStrength;
+
+    
+    
+            @Column(name = "ELONGATION_AT_BREAK_PERCENTAGE")
+            private double elongationAtBreakPercentage;
+
+    
+    
+            @Column(name = "ESTIMATED_THREAD_DIAMETER")
+            private double estimatedThreadDiameter;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "FIBER_SHAPE_GUID", foreignKeyColumnName = "GUID")})
+            private FiberShape fiberShape;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "FIBER_SYNTH_GUID", foreignKeyColumnName = "GUID")})
+            private FiberSynth fiberSynth;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "LINEAR_MASS_DENSITY_UNIT_GUID", foreignKeyColumnName = "GUID")})
+            private LinearMassDensityUnit linearMassDensityUnit;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_COLOR_GUID", foreignKeyColumnName = "GUID")})
+            private MediaColor mediaColor;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_CONDITION_GUID", foreignKeyColumnName = "GUID")})
+            private MediaCondition mediaCondition;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_MATERIAL_GUID", foreignKeyColumnName = "GUID")})
+            private MediaMaterial mediaMaterial;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "MEDIA_PURPOSE_GUID", foreignKeyColumnName = "GUID")})
+            private MediaPurpose mediaPurpose;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Manufacturer.
+         *
+         * return the Manufacturer
+         */
+         @Bindable
+         public String getManufacturer()
+         {
+            return manufacturer;
+         }
+
+         /**
+         * Sets the Manufacturer.
+         *
+         * @param manufacturer the Manufacturer
+         */
+         public void setManufacturer(String manufacturer)
+         {
+            this.manufacturer = manufacturer;
+            notifyPropertyChanged(BR.manufacturer);
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the FiberSize.
+         *
+         * return the FiberSize
+         */
+         @Bindable
+         public double getFiberSize()
+         {
+            return fiberSize;
+         }
+
+         /**
+         * Sets the FiberSize.
+         *
+         * @param fiberSize the FiberSize
+         */
+         public void setFiberSize(double fiberSize)
+         {
+            this.fiberSize = fiberSize;
+            notifyPropertyChanged(BR.fiberSize);
+         }
+     
+     
+         /**
+         * Gets the NumberOfFibers.
+         *
+         * return the NumberOfFibers
+         */
+         @Bindable
+         public int getNumberOfFibers()
+         {
+            return numberOfFibers;
+         }
+
+         /**
+         * Sets the NumberOfFibers.
+         *
+         * @param numberOfFibers the NumberOfFibers
+         */
+         public void setNumberOfFibers(int numberOfFibers)
+         {
+            this.numberOfFibers = numberOfFibers;
+            notifyPropertyChanged(BR.numberOfFibers);
+         }
+     
+     
+         /**
+         * Gets the PliesPerFiber.
+         *
+         * return the PliesPerFiber
+         */
+         @Bindable
+         public int getPliesPerFiber()
+         {
+            return pliesPerFiber;
+         }
+
+         /**
+         * Sets the PliesPerFiber.
+         *
+         * @param pliesPerFiber the PliesPerFiber
+         */
+         public void setPliesPerFiber(int pliesPerFiber)
+         {
+            this.pliesPerFiber = pliesPerFiber;
+            notifyPropertyChanged(BR.pliesPerFiber);
+         }
+     
+     
+         /**
+         * Gets the PliesPerThread.
+         *
+         * return the PliesPerThread
+         */
+         @Bindable
+         public int getPliesPerThread()
+         {
+            return pliesPerThread;
+         }
+
+         /**
+         * Sets the PliesPerThread.
+         *
+         * @param pliesPerThread the PliesPerThread
+         */
+         public void setPliesPerThread(int pliesPerThread)
+         {
+            this.pliesPerThread = pliesPerThread;
+            notifyPropertyChanged(BR.pliesPerThread);
+         }
+     
+     
+         /**
+         * Gets the Twisted.
+         *
+         * return the Twisted
+         */
+         @Bindable
+         public boolean isTwisted()
+         {
+            return twisted;
+         }
+
+         /**
+         * Sets the Twisted.
+         *
+         * @param twisted the Twisted
+         */
+         public void setTwisted(boolean twisted)
+         {
+            this.twisted = twisted;
+            notifyPropertyChanged(BR.twisted);
+         }
+     
+     
+         /**
+         * Gets the AirEntanglement.
+         *
+         * return the AirEntanglement
+         */
+         @Bindable
+         public boolean isAirEntanglement()
+         {
+            return airEntanglement;
+         }
+
+         /**
+         * Sets the AirEntanglement.
+         *
+         * @param airEntanglement the AirEntanglement
+         */
+         public void setAirEntanglement(boolean airEntanglement)
+         {
+            this.airEntanglement = airEntanglement;
+            notifyPropertyChanged(BR.airEntanglement);
+         }
+     
+     
+         /**
+         * Gets the Lubricant.
+         *
+         * return the Lubricant
+         */
+         @Bindable
+         public boolean isLubricant()
+         {
+            return lubricant;
+         }
+
+         /**
+         * Sets the Lubricant.
+         *
+         * @param lubricant the Lubricant
+         */
+         public void setLubricant(boolean lubricant)
+         {
+            this.lubricant = lubricant;
+            notifyPropertyChanged(BR.lubricant);
+         }
+     
+     
+         /**
+         * Gets the TensileStrength.
+         *
+         * return the TensileStrength
+         */
+         @Bindable
+         public double getTensileStrength()
+         {
+            return tensileStrength;
+         }
+
+         /**
+         * Sets the TensileStrength.
+         *
+         * @param tensileStrength the TensileStrength
+         */
+         public void setTensileStrength(double tensileStrength)
+         {
+            this.tensileStrength = tensileStrength;
+            notifyPropertyChanged(BR.tensileStrength);
+         }
+     
+     
+         /**
+         * Gets the ElongationAtBreakPercentage.
+         *
+         * return the ElongationAtBreakPercentage
+         */
+         @Bindable
+         public double getElongationAtBreakPercentage()
+         {
+            return elongationAtBreakPercentage;
+         }
+
+         /**
+         * Sets the ElongationAtBreakPercentage.
+         *
+         * @param elongationAtBreakPercentage the ElongationAtBreakPercentage
+         */
+         public void setElongationAtBreakPercentage(double elongationAtBreakPercentage)
+         {
+            this.elongationAtBreakPercentage = elongationAtBreakPercentage;
+            notifyPropertyChanged(BR.elongationAtBreakPercentage);
+         }
+     
+     
+         /**
+         * Gets the EstimatedThreadDiameter.
+         *
+         * return the EstimatedThreadDiameter
+         */
+         @Bindable
+         public double getEstimatedThreadDiameter()
+         {
+            return estimatedThreadDiameter;
+         }
+
+         /**
+         * Sets the EstimatedThreadDiameter.
+         *
+         * @param estimatedThreadDiameter the EstimatedThreadDiameter
+         */
+         public void setEstimatedThreadDiameter(double estimatedThreadDiameter)
+         {
+            this.estimatedThreadDiameter = estimatedThreadDiameter;
+            notifyPropertyChanged(BR.estimatedThreadDiameter);
+         }
+     
+     
+         /**
+         * Gets the FiberShape.
+         *
+         * return the FiberShape
+         */
+         @Bindable
+         public FiberShape getFiberShape()
+         {
+            return fiberShape;
+         }
+
+         /**
+         * Sets the FiberShape.
+         *
+         * @param fiberShape the FiberShape
+         */
+         public void setFiberShape(FiberShape fiberShape)
+         {
+            this.fiberShape = fiberShape;
+            notifyPropertyChanged(BR.fiberShape);
+         }
+     
+     
+         /**
+         * Gets the FiberSynth.
+         *
+         * return the FiberSynth
+         */
+         @Bindable
+         public FiberSynth getFiberSynth()
+         {
+            return fiberSynth;
+         }
+
+         /**
+         * Sets the FiberSynth.
+         *
+         * @param fiberSynth the FiberSynth
+         */
+         public void setFiberSynth(FiberSynth fiberSynth)
+         {
+            this.fiberSynth = fiberSynth;
+            notifyPropertyChanged(BR.fiberSynth);
+         }
+     
+     
+         /**
+         * Gets the LinearMassDensityUnit.
+         *
+         * return the LinearMassDensityUnit
+         */
+         @Bindable
+         public LinearMassDensityUnit getLinearMassDensityUnit()
+         {
+            return linearMassDensityUnit;
+         }
+
+         /**
+         * Sets the LinearMassDensityUnit.
+         *
+         * @param linearMassDensityUnit the LinearMassDensityUnit
+         */
+         public void setLinearMassDensityUnit(LinearMassDensityUnit linearMassDensityUnit)
+         {
+            this.linearMassDensityUnit = linearMassDensityUnit;
+            notifyPropertyChanged(BR.linearMassDensityUnit);
+         }
+     
+     
+         /**
+         * Gets the MediaColor.
+         *
+         * return the MediaColor
+         */
+         @Bindable
+         public MediaColor getMediaColor()
+         {
+            return mediaColor;
+         }
+
+         /**
+         * Sets the MediaColor.
+         *
+         * @param mediaColor the MediaColor
+         */
+         public void setMediaColor(MediaColor mediaColor)
+         {
+            this.mediaColor = mediaColor;
+            notifyPropertyChanged(BR.mediaColor);
+         }
+     
+     
+         /**
+         * Gets the MediaCondition.
+         *
+         * return the MediaCondition
+         */
+         @Bindable
+         public MediaCondition getMediaCondition()
+         {
+            return mediaCondition;
+         }
+
+         /**
+         * Sets the MediaCondition.
+         *
+         * @param mediaCondition the MediaCondition
+         */
+         public void setMediaCondition(MediaCondition mediaCondition)
+         {
+            this.mediaCondition = mediaCondition;
+            notifyPropertyChanged(BR.mediaCondition);
+         }
+     
+     
+         /**
+         * Gets the MediaMaterial.
+         *
+         * return the MediaMaterial
+         */
+         @Bindable
+         public MediaMaterial getMediaMaterial()
+         {
+            return mediaMaterial;
+         }
+
+         /**
+         * Sets the MediaMaterial.
+         *
+         * @param mediaMaterial the MediaMaterial
+         */
+         public void setMediaMaterial(MediaMaterial mediaMaterial)
+         {
+            this.mediaMaterial = mediaMaterial;
+            notifyPropertyChanged(BR.mediaMaterial);
+         }
+     
+     
+         /**
+         * Gets the MediaPurpose.
+         *
+         * return the MediaPurpose
+         */
+         @Bindable
+         public MediaPurpose getMediaPurpose()
+         {
+            return mediaPurpose;
+         }
+
+         /**
+         * Sets the MediaPurpose.
+         *
+         * @param mediaPurpose the MediaPurpose
+         */
+         public void setMediaPurpose(MediaPurpose mediaPurpose)
+         {
+            this.mediaPurpose = mediaPurpose;
+            notifyPropertyChanged(BR.mediaPurpose);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java
index 89407ef95..a2388367b 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "ROLES", database = TangoDB.class, cachingEnabled = true)
+public class Role extends RoleBase
+{
 
-    @Table(name = "ROLES", database = TangoDB.class)
-    public class Role extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RoleBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RoleBase.java
new file mode 100644
index 000000000..8101489e1
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RoleBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class RoleBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java
index 3907d7fb5..238a3461b 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java
@@ -1,74 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "ROLES_PERMISSIONS", database = TangoDB.class, cachingEnabled = true)
+public class RolesPermission extends RolesPermissionBase
+{
 
-    @Table(name = "ROLES_PERMISSIONS", database = TangoDB.class)
-    public class RolesPermission extends Entity 
-    {
     
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "PERMISSION_GUID", foreignKeyColumnName = "GUID")})
-            private Permission permission;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "ROLE_GUID", foreignKeyColumnName = "GUID")})
-            private Role role;
-
-    
-
-     
-         /**
-         * Gets the Permission.
-         *
-         * return the Permission
-         */
-         @Bindable
-         public Permission getPermission()
-         {
-            return permission;
-         }
-
-         /**
-         * Sets the Permission.
-         *
-         * @param permission the Permission
-         */
-         public void setPermission(Permission permission)
-         {
-            this.permission = permission;
-            notifyPropertyChanged(BR.permission);
-         }
-     
-     
-         /**
-         * Gets the Role.
-         *
-         * return the Role
-         */
-         @Bindable
-         public Role getRole()
-         {
-            return role;
-         }
-
-         /**
-         * Sets the Role.
-         *
-         * @param role the Role
-         */
-         public void setRole(Role role)
-         {
-            this.role = role;
-            notifyPropertyChanged(BR.role);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermissionBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermissionBase.java
new file mode 100644
index 000000000..83042af4e
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermissionBase.java
@@ -0,0 +1,71 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class RolesPermissionBase extends Entity 
+    {
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "PERMISSION_GUID", foreignKeyColumnName = "GUID")})
+            private Permission permission;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "ROLE_GUID", foreignKeyColumnName = "GUID")})
+            private Role role;
+
+    
+
+     
+         /**
+         * Gets the Permission.
+         *
+         * return the Permission
+         */
+         @Bindable
+         public Permission getPermission()
+         {
+            return permission;
+         }
+
+         /**
+         * Sets the Permission.
+         *
+         * @param permission the Permission
+         */
+         public void setPermission(Permission permission)
+         {
+            this.permission = permission;
+            notifyPropertyChanged(BR.permission);
+         }
+     
+     
+         /**
+         * Gets the Role.
+         *
+         * return the Role
+         */
+         @Bindable
+         public Role getRole()
+         {
+            return role;
+         }
+
+         /**
+         * Sets the Role.
+         *
+         * @param role the Role
+         */
+         public void setRole(Role role)
+         {
+            this.role = role;
+            notifyPropertyChanged(BR.role);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java
index c92e86485..a11367722 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Segment.java
@@ -1,130 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "SEGMENTS", database = TangoDB.class, cachingEnabled = true)
+public class Segment extends SegmentBase
+{
 
-    @Table(name = "SEGMENTS", database = TangoDB.class)
-    public class Segment extends Entity 
-    {
     
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "LENGTH")
-            private double length;
-
-    
-    
-            @Column(name = "SEGMENT_INDEX")
-            private int segmentIndex;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "JOB_GUID", foreignKeyColumnName = "GUID")})
-            private Job job;
-
-    
-
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Length.
-         *
-         * return the Length
-         */
-         @Bindable
-         public double getLength()
-         {
-            return length;
-         }
-
-         /**
-         * Sets the Length.
-         *
-         * @param length the Length
-         */
-         public void setLength(double length)
-         {
-            this.length = length;
-            notifyPropertyChanged(BR.length);
-         }
-     
-     
-         /**
-         * Gets the SegmentIndex.
-         *
-         * return the SegmentIndex
-         */
-         @Bindable
-         public int getSegmentIndex()
-         {
-            return segmentIndex;
-         }
-
-         /**
-         * Sets the SegmentIndex.
-         *
-         * @param segmentIndex the SegmentIndex
-         */
-         public void setSegmentIndex(int segmentIndex)
-         {
-            this.segmentIndex = segmentIndex;
-            notifyPropertyChanged(BR.segmentIndex);
-         }
-     
-     
-         /**
-         * Gets the Job.
-         *
-         * return the Job
-         */
-         @Bindable
-         public Job getJob()
-         {
-            return job;
-         }
-
-         /**
-         * Sets the Job.
-         *
-         * @param job the Job
-         */
-         public void setJob(Job job)
-         {
-            this.job = job;
-            notifyPropertyChanged(BR.job);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SegmentBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SegmentBase.java
new file mode 100644
index 000000000..b917cea2a
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SegmentBase.java
@@ -0,0 +1,127 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class SegmentBase extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "LENGTH")
+            private double length;
+
+    
+    
+            @Column(name = "SEGMENT_INDEX")
+            private int segmentIndex;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "JOB_GUID", foreignKeyColumnName = "GUID")})
+            private Job job;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Length.
+         *
+         * return the Length
+         */
+         @Bindable
+         public double getLength()
+         {
+            return length;
+         }
+
+         /**
+         * Sets the Length.
+         *
+         * @param length the Length
+         */
+         public void setLength(double length)
+         {
+            this.length = length;
+            notifyPropertyChanged(BR.length);
+         }
+     
+     
+         /**
+         * Gets the SegmentIndex.
+         *
+         * return the SegmentIndex
+         */
+         @Bindable
+         public int getSegmentIndex()
+         {
+            return segmentIndex;
+         }
+
+         /**
+         * Sets the SegmentIndex.
+         *
+         * @param segmentIndex the SegmentIndex
+         */
+         public void setSegmentIndex(int segmentIndex)
+         {
+            this.segmentIndex = segmentIndex;
+            notifyPropertyChanged(BR.segmentIndex);
+         }
+     
+     
+         /**
+         * Gets the Job.
+         *
+         * return the Job
+         */
+         @Bindable
+         public Job getJob()
+         {
+            return job;
+         }
+
+         /**
+         * Sets the Job.
+         *
+         * @param job the Job
+         */
+         public void setJob(Job job)
+         {
+            this.job = job;
+            notifyPropertyChanged(BR.job);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java
index 3fcd0c7b4..b9cb5520e 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolType.java
@@ -1,242 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "SPOOL_TYPES", database = TangoDB.class, cachingEnabled = true)
+public class SpoolType extends SpoolTypeBase
+{
 
-    @Table(name = "SPOOL_TYPES", database = TangoDB.class)
-    public class SpoolType extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "LENGTH")
-            private double length;
-
-    
-    
-            @Column(name = "WEIGHT")
-            private double weight;
-
-    
-    
-            @Column(name = "DIAMETER")
-            private double diameter;
-
-    
-    
-            @Column(name = "START_OFFSET_PULSES")
-            private int startOffsetPulses;
-
-    
-    
-            @Column(name = "BACKING_RATE")
-            private int backingRate;
-
-    
-    
-            @Column(name = "SEGMENT_OFFSET_PULSES")
-            private int segmentOffsetPulses;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Length.
-         *
-         * return the Length
-         */
-         @Bindable
-         public double getLength()
-         {
-            return length;
-         }
-
-         /**
-         * Sets the Length.
-         *
-         * @param length the Length
-         */
-         public void setLength(double length)
-         {
-            this.length = length;
-            notifyPropertyChanged(BR.length);
-         }
-     
-     
-         /**
-         * Gets the Weight.
-         *
-         * return the Weight
-         */
-         @Bindable
-         public double getWeight()
-         {
-            return weight;
-         }
-
-         /**
-         * Sets the Weight.
-         *
-         * @param weight the Weight
-         */
-         public void setWeight(double weight)
-         {
-            this.weight = weight;
-            notifyPropertyChanged(BR.weight);
-         }
-     
-     
-         /**
-         * Gets the Diameter.
-         *
-         * return the Diameter
-         */
-         @Bindable
-         public double getDiameter()
-         {
-            return diameter;
-         }
-
-         /**
-         * Sets the Diameter.
-         *
-         * @param diameter the Diameter
-         */
-         public void setDiameter(double diameter)
-         {
-            this.diameter = diameter;
-            notifyPropertyChanged(BR.diameter);
-         }
-     
-     
-         /**
-         * Gets the StartOffsetPulses.
-         *
-         * return the StartOffsetPulses
-         */
-         @Bindable
-         public int getStartOffsetPulses()
-         {
-            return startOffsetPulses;
-         }
-
-         /**
-         * Sets the StartOffsetPulses.
-         *
-         * @param startOffsetPulses the StartOffsetPulses
-         */
-         public void setStartOffsetPulses(int startOffsetPulses)
-         {
-            this.startOffsetPulses = startOffsetPulses;
-            notifyPropertyChanged(BR.startOffsetPulses);
-         }
-     
-     
-         /**
-         * Gets the BackingRate.
-         *
-         * return the BackingRate
-         */
-         @Bindable
-         public int getBackingRate()
-         {
-            return backingRate;
-         }
-
-         /**
-         * Sets the BackingRate.
-         *
-         * @param backingRate the BackingRate
-         */
-         public void setBackingRate(int backingRate)
-         {
-            this.backingRate = backingRate;
-            notifyPropertyChanged(BR.backingRate);
-         }
-     
-     
-         /**
-         * Gets the SegmentOffsetPulses.
-         *
-         * return the SegmentOffsetPulses
-         */
-         @Bindable
-         public int getSegmentOffsetPulses()
-         {
-            return segmentOffsetPulses;
-         }
-
-         /**
-         * Sets the SegmentOffsetPulses.
-         *
-         * @param segmentOffsetPulses the SegmentOffsetPulses
-         */
-         public void setSegmentOffsetPulses(int segmentOffsetPulses)
-         {
-            this.segmentOffsetPulses = segmentOffsetPulses;
-            notifyPropertyChanged(BR.segmentOffsetPulses);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolTypeBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolTypeBase.java
new file mode 100644
index 000000000..c0f9cd0c3
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SpoolTypeBase.java
@@ -0,0 +1,239 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class SpoolTypeBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "LENGTH")
+            private double length;
+
+    
+    
+            @Column(name = "WEIGHT")
+            private double weight;
+
+    
+    
+            @Column(name = "DIAMETER")
+            private double diameter;
+
+    
+    
+            @Column(name = "START_OFFSET_PULSES")
+            private int startOffsetPulses;
+
+    
+    
+            @Column(name = "BACKING_RATE")
+            private int backingRate;
+
+    
+    
+            @Column(name = "SEGMENT_OFFSET_PULSES")
+            private int segmentOffsetPulses;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Length.
+         *
+         * return the Length
+         */
+         @Bindable
+         public double getLength()
+         {
+            return length;
+         }
+
+         /**
+         * Sets the Length.
+         *
+         * @param length the Length
+         */
+         public void setLength(double length)
+         {
+            this.length = length;
+            notifyPropertyChanged(BR.length);
+         }
+     
+     
+         /**
+         * Gets the Weight.
+         *
+         * return the Weight
+         */
+         @Bindable
+         public double getWeight()
+         {
+            return weight;
+         }
+
+         /**
+         * Sets the Weight.
+         *
+         * @param weight the Weight
+         */
+         public void setWeight(double weight)
+         {
+            this.weight = weight;
+            notifyPropertyChanged(BR.weight);
+         }
+     
+     
+         /**
+         * Gets the Diameter.
+         *
+         * return the Diameter
+         */
+         @Bindable
+         public double getDiameter()
+         {
+            return diameter;
+         }
+
+         /**
+         * Sets the Diameter.
+         *
+         * @param diameter the Diameter
+         */
+         public void setDiameter(double diameter)
+         {
+            this.diameter = diameter;
+            notifyPropertyChanged(BR.diameter);
+         }
+     
+     
+         /**
+         * Gets the StartOffsetPulses.
+         *
+         * return the StartOffsetPulses
+         */
+         @Bindable
+         public int getStartOffsetPulses()
+         {
+            return startOffsetPulses;
+         }
+
+         /**
+         * Sets the StartOffsetPulses.
+         *
+         * @param startOffsetPulses the StartOffsetPulses
+         */
+         public void setStartOffsetPulses(int startOffsetPulses)
+         {
+            this.startOffsetPulses = startOffsetPulses;
+            notifyPropertyChanged(BR.startOffsetPulses);
+         }
+     
+     
+         /**
+         * Gets the BackingRate.
+         *
+         * return the BackingRate
+         */
+         @Bindable
+         public int getBackingRate()
+         {
+            return backingRate;
+         }
+
+         /**
+         * Sets the BackingRate.
+         *
+         * @param backingRate the BackingRate
+         */
+         public void setBackingRate(int backingRate)
+         {
+            this.backingRate = backingRate;
+            notifyPropertyChanged(BR.backingRate);
+         }
+     
+     
+         /**
+         * Gets the SegmentOffsetPulses.
+         *
+         * return the SegmentOffsetPulses
+         */
+         @Bindable
+         public int getSegmentOffsetPulses()
+         {
+            return segmentOffsetPulses;
+         }
+
+         /**
+         * Sets the SegmentOffsetPulses.
+         *
+         * @param segmentOffsetPulses the SegmentOffsetPulses
+         */
+         public void setSegmentOffsetPulses(int segmentOffsetPulses)
+         {
+            this.segmentOffsetPulses = segmentOffsetPulses;
+            notifyPropertyChanged(BR.segmentOffsetPulses);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java
index acfad4bb7..6dfb752be 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java
@@ -1,18 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "SYNC_CONFIGURATIONS", database = TangoDB.class, cachingEnabled = true)
+public class SyncConfiguration extends SyncConfigurationBase
+{
 
-    @Table(name = "SYNC_CONFIGURATIONS", database = TangoDB.class)
-    public class SyncConfiguration extends Entity 
-    {
-
-    }
+    
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfigurationBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfigurationBase.java
new file mode 100644
index 000000000..3e8428983
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfigurationBase.java
@@ -0,0 +1,15 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class SyncConfigurationBase extends Entity 
+    {
+
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java
index 104d5320d..fb29cab06 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechController.java
@@ -1,186 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "TECH_CONTROLLERS", database = TangoDB.class, cachingEnabled = true)
+public class TechController extends TechControllerBase
+{
 
-    @Table(name = "TECH_CONTROLLERS", database = TangoDB.class)
-    public class TechController extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "MIN")
-            private double min;
-
-    
-    
-            @Column(name = "MAX")
-            private double max;
-
-    
-    
-            @Column(name = "UNITS")
-            private String units;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the Min.
-         *
-         * return the Min
-         */
-         @Bindable
-         public double getMin()
-         {
-            return min;
-         }
-
-         /**
-         * Sets the Min.
-         *
-         * @param min the Min
-         */
-         public void setMin(double min)
-         {
-            this.min = min;
-            notifyPropertyChanged(BR.min);
-         }
-     
-     
-         /**
-         * Gets the Max.
-         *
-         * return the Max
-         */
-         @Bindable
-         public double getMax()
-         {
-            return max;
-         }
-
-         /**
-         * Sets the Max.
-         *
-         * @param max the Max
-         */
-         public void setMax(double max)
-         {
-            this.max = max;
-            notifyPropertyChanged(BR.max);
-         }
-     
-     
-         /**
-         * Gets the Units.
-         *
-         * return the Units
-         */
-         @Bindable
-         public String getUnits()
-         {
-            return units;
-         }
-
-         /**
-         * Sets the Units.
-         *
-         * @param units the Units
-         */
-         public void setUnits(String units)
-         {
-            this.units = units;
-            notifyPropertyChanged(BR.units);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechControllerBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechControllerBase.java
new file mode 100644
index 000000000..367f7c11e
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechControllerBase.java
@@ -0,0 +1,183 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class TechControllerBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+    
+            @Column(name = "MIN")
+            private double min;
+
+    
+    
+            @Column(name = "MAX")
+            private double max;
+
+    
+    
+            @Column(name = "UNITS")
+            private String units;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+     
+         /**
+         * Gets the Min.
+         *
+         * return the Min
+         */
+         @Bindable
+         public double getMin()
+         {
+            return min;
+         }
+
+         /**
+         * Sets the Min.
+         *
+         * @param min the Min
+         */
+         public void setMin(double min)
+         {
+            this.min = min;
+            notifyPropertyChanged(BR.min);
+         }
+     
+     
+         /**
+         * Gets the Max.
+         *
+         * return the Max
+         */
+         @Bindable
+         public double getMax()
+         {
+            return max;
+         }
+
+         /**
+         * Sets the Max.
+         *
+         * @param max the Max
+         */
+         public void setMax(double max)
+         {
+            this.max = max;
+            notifyPropertyChanged(BR.max);
+         }
+     
+     
+         /**
+         * Gets the Units.
+         *
+         * return the Units
+         */
+         @Bindable
+         public String getUnits()
+         {
+            return units;
+         }
+
+         /**
+         * Sets the Units.
+         *
+         * @param units the Units
+         */
+         public void setUnits(String units)
+         {
+            this.units = units;
+            notifyPropertyChanged(BR.units);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java
index 6034b6f6d..ac66c7b2c 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenser.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "TECH_DISPENSERS", database = TangoDB.class, cachingEnabled = true)
+public class TechDispenser extends TechDispenserBase
+{
 
-    @Table(name = "TECH_DISPENSERS", database = TangoDB.class)
-    public class TechDispenser extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenserBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenserBase.java
new file mode 100644
index 000000000..839e29f2b
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechDispenserBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class TechDispenserBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java
index 324130007..ba1809bd3 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIo.java
@@ -1,214 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "TECH_IOS", database = TangoDB.class, cachingEnabled = true)
+public class TechIo extends TechIoBase
+{
 
-    @Table(name = "TECH_IOS", database = TangoDB.class)
-    public class TechIo extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "PORT")
-            private int port;
-
-    
-    
-            @Column(name = "TYPE")
-            private int type;
-
-    
-    
-            @Column(name = "MIN")
-            private double min;
-
-    
-    
-            @Column(name = "MAX")
-            private double max;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the Port.
-         *
-         * return the Port
-         */
-         @Bindable
-         public int getPort()
-         {
-            return port;
-         }
-
-         /**
-         * Sets the Port.
-         *
-         * @param port the Port
-         */
-         public void setPort(int port)
-         {
-            this.port = port;
-            notifyPropertyChanged(BR.port);
-         }
-     
-     
-         /**
-         * Gets the Type.
-         *
-         * return the Type
-         */
-         @Bindable
-         public int getType()
-         {
-            return type;
-         }
-
-         /**
-         * Sets the Type.
-         *
-         * @param type the Type
-         */
-         public void setType(int type)
-         {
-            this.type = type;
-            notifyPropertyChanged(BR.type);
-         }
-     
-     
-         /**
-         * Gets the Min.
-         *
-         * return the Min
-         */
-         @Bindable
-         public double getMin()
-         {
-            return min;
-         }
-
-         /**
-         * Sets the Min.
-         *
-         * @param min the Min
-         */
-         public void setMin(double min)
-         {
-            this.min = min;
-            notifyPropertyChanged(BR.min);
-         }
-     
-     
-         /**
-         * Gets the Max.
-         *
-         * return the Max
-         */
-         @Bindable
-         public double getMax()
-         {
-            return max;
-         }
-
-         /**
-         * Sets the Max.
-         *
-         * @param max the Max
-         */
-         public void setMax(double max)
-         {
-            this.max = max;
-            notifyPropertyChanged(BR.max);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIoBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIoBase.java
new file mode 100644
index 000000000..38581baeb
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechIoBase.java
@@ -0,0 +1,211 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class TechIoBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+    
+            @Column(name = "PORT")
+            private int port;
+
+    
+    
+            @Column(name = "TYPE")
+            private int type;
+
+    
+    
+            @Column(name = "MIN")
+            private double min;
+
+    
+    
+            @Column(name = "MAX")
+            private double max;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+     
+         /**
+         * Gets the Port.
+         *
+         * return the Port
+         */
+         @Bindable
+         public int getPort()
+         {
+            return port;
+         }
+
+         /**
+         * Sets the Port.
+         *
+         * @param port the Port
+         */
+         public void setPort(int port)
+         {
+            this.port = port;
+            notifyPropertyChanged(BR.port);
+         }
+     
+     
+         /**
+         * Gets the Type.
+         *
+         * return the Type
+         */
+         @Bindable
+         public int getType()
+         {
+            return type;
+         }
+
+         /**
+         * Sets the Type.
+         *
+         * @param type the Type
+         */
+         public void setType(int type)
+         {
+            this.type = type;
+            notifyPropertyChanged(BR.type);
+         }
+     
+     
+         /**
+         * Gets the Min.
+         *
+         * return the Min
+         */
+         @Bindable
+         public double getMin()
+         {
+            return min;
+         }
+
+         /**
+         * Sets the Min.
+         *
+         * @param min the Min
+         */
+         public void setMin(double min)
+         {
+            this.min = min;
+            notifyPropertyChanged(BR.min);
+         }
+     
+     
+         /**
+         * Gets the Max.
+         *
+         * return the Max
+         */
+         @Bindable
+         public double getMax()
+         {
+            return max;
+         }
+
+         /**
+         * Sets the Max.
+         *
+         * @param max the Max
+         */
+         public void setMax(double max)
+         {
+            this.max = max;
+            notifyPropertyChanged(BR.max);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java
index 7973037fb..5324cdd6d 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitor.java
@@ -1,270 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "TECH_MONITORS", database = TangoDB.class, cachingEnabled = true)
+public class TechMonitor extends TechMonitorBase
+{
 
-    @Table(name = "TECH_MONITORS", database = TangoDB.class)
-    public class TechMonitor extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "MIN")
-            private double min;
-
-    
-    
-            @Column(name = "MAX")
-            private double max;
-
-    
-    
-            @Column(name = "UNITS")
-            private String units;
-
-    
-    
-            @Column(name = "POINTS_PER_FRAME")
-            private int pointsPerFrame;
-
-    
-    
-            @Column(name = "MULTI_CHANNEL")
-            private boolean multiChannel;
-
-    
-    
-            @Column(name = "CHANNEL_COUNT")
-            private int channelCount;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the Min.
-         *
-         * return the Min
-         */
-         @Bindable
-         public double getMin()
-         {
-            return min;
-         }
-
-         /**
-         * Sets the Min.
-         *
-         * @param min the Min
-         */
-         public void setMin(double min)
-         {
-            this.min = min;
-            notifyPropertyChanged(BR.min);
-         }
-     
-     
-         /**
-         * Gets the Max.
-         *
-         * return the Max
-         */
-         @Bindable
-         public double getMax()
-         {
-            return max;
-         }
-
-         /**
-         * Sets the Max.
-         *
-         * @param max the Max
-         */
-         public void setMax(double max)
-         {
-            this.max = max;
-            notifyPropertyChanged(BR.max);
-         }
-     
-     
-         /**
-         * Gets the Units.
-         *
-         * return the Units
-         */
-         @Bindable
-         public String getUnits()
-         {
-            return units;
-         }
-
-         /**
-         * Sets the Units.
-         *
-         * @param units the Units
-         */
-         public void setUnits(String units)
-         {
-            this.units = units;
-            notifyPropertyChanged(BR.units);
-         }
-     
-     
-         /**
-         * Gets the PointsPerFrame.
-         *
-         * return the PointsPerFrame
-         */
-         @Bindable
-         public int getPointsPerFrame()
-         {
-            return pointsPerFrame;
-         }
-
-         /**
-         * Sets the PointsPerFrame.
-         *
-         * @param pointsPerFrame the PointsPerFrame
-         */
-         public void setPointsPerFrame(int pointsPerFrame)
-         {
-            this.pointsPerFrame = pointsPerFrame;
-            notifyPropertyChanged(BR.pointsPerFrame);
-         }
-     
-     
-         /**
-         * Gets the MultiChannel.
-         *
-         * return the MultiChannel
-         */
-         @Bindable
-         public boolean isMultiChannel()
-         {
-            return multiChannel;
-         }
-
-         /**
-         * Sets the MultiChannel.
-         *
-         * @param multiChannel the MultiChannel
-         */
-         public void setMultiChannel(boolean multiChannel)
-         {
-            this.multiChannel = multiChannel;
-            notifyPropertyChanged(BR.multiChannel);
-         }
-     
-     
-         /**
-         * Gets the ChannelCount.
-         *
-         * return the ChannelCount
-         */
-         @Bindable
-         public int getChannelCount()
-         {
-            return channelCount;
-         }
-
-         /**
-         * Sets the ChannelCount.
-         *
-         * @param channelCount the ChannelCount
-         */
-         public void setChannelCount(int channelCount)
-         {
-            this.channelCount = channelCount;
-            notifyPropertyChanged(BR.channelCount);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitorBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitorBase.java
new file mode 100644
index 000000000..921caf4b7
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMonitorBase.java
@@ -0,0 +1,267 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class TechMonitorBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+    
+            @Column(name = "MIN")
+            private double min;
+
+    
+    
+            @Column(name = "MAX")
+            private double max;
+
+    
+    
+            @Column(name = "UNITS")
+            private String units;
+
+    
+    
+            @Column(name = "POINTS_PER_FRAME")
+            private int pointsPerFrame;
+
+    
+    
+            @Column(name = "MULTI_CHANNEL")
+            private boolean multiChannel;
+
+    
+    
+            @Column(name = "CHANNEL_COUNT")
+            private int channelCount;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+     
+         /**
+         * Gets the Min.
+         *
+         * return the Min
+         */
+         @Bindable
+         public double getMin()
+         {
+            return min;
+         }
+
+         /**
+         * Sets the Min.
+         *
+         * @param min the Min
+         */
+         public void setMin(double min)
+         {
+            this.min = min;
+            notifyPropertyChanged(BR.min);
+         }
+     
+     
+         /**
+         * Gets the Max.
+         *
+         * return the Max
+         */
+         @Bindable
+         public double getMax()
+         {
+            return max;
+         }
+
+         /**
+         * Sets the Max.
+         *
+         * @param max the Max
+         */
+         public void setMax(double max)
+         {
+            this.max = max;
+            notifyPropertyChanged(BR.max);
+         }
+     
+     
+         /**
+         * Gets the Units.
+         *
+         * return the Units
+         */
+         @Bindable
+         public String getUnits()
+         {
+            return units;
+         }
+
+         /**
+         * Sets the Units.
+         *
+         * @param units the Units
+         */
+         public void setUnits(String units)
+         {
+            this.units = units;
+            notifyPropertyChanged(BR.units);
+         }
+     
+     
+         /**
+         * Gets the PointsPerFrame.
+         *
+         * return the PointsPerFrame
+         */
+         @Bindable
+         public int getPointsPerFrame()
+         {
+            return pointsPerFrame;
+         }
+
+         /**
+         * Sets the PointsPerFrame.
+         *
+         * @param pointsPerFrame the PointsPerFrame
+         */
+         public void setPointsPerFrame(int pointsPerFrame)
+         {
+            this.pointsPerFrame = pointsPerFrame;
+            notifyPropertyChanged(BR.pointsPerFrame);
+         }
+     
+     
+         /**
+         * Gets the MultiChannel.
+         *
+         * return the MultiChannel
+         */
+         @Bindable
+         public boolean isMultiChannel()
+         {
+            return multiChannel;
+         }
+
+         /**
+         * Sets the MultiChannel.
+         *
+         * @param multiChannel the MultiChannel
+         */
+         public void setMultiChannel(boolean multiChannel)
+         {
+            this.multiChannel = multiChannel;
+            notifyPropertyChanged(BR.multiChannel);
+         }
+     
+     
+         /**
+         * Gets the ChannelCount.
+         *
+         * return the ChannelCount
+         */
+         @Bindable
+         public int getChannelCount()
+         {
+            return channelCount;
+         }
+
+         /**
+         * Sets the ChannelCount.
+         *
+         * @param channelCount the ChannelCount
+         */
+         public void setChannelCount(int channelCount)
+         {
+            this.channelCount = channelCount;
+            notifyPropertyChanged(BR.channelCount);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java
index 035f87a8e..0dd2fe139 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotor.java
@@ -1,130 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "TECH_MOTORS", database = TangoDB.class, cachingEnabled = true)
+public class TechMotor extends TechMotorBase
+{
 
-    @Table(name = "TECH_MOTORS", database = TangoDB.class)
-    public class TechMotor extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-    
-            @Column(name = "SUPPORTS_HOMING")
-            private boolean supportsHoming;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-     
-         /**
-         * Gets the SupportsHoming.
-         *
-         * return the SupportsHoming
-         */
-         @Bindable
-         public boolean isSupportsHoming()
-         {
-            return supportsHoming;
-         }
-
-         /**
-         * Sets the SupportsHoming.
-         *
-         * @param supportsHoming the SupportsHoming
-         */
-         public void setSupportsHoming(boolean supportsHoming)
-         {
-            this.supportsHoming = supportsHoming;
-            notifyPropertyChanged(BR.supportsHoming);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotorBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotorBase.java
new file mode 100644
index 000000000..f56865c88
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechMotorBase.java
@@ -0,0 +1,127 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class TechMotorBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+    
+            @Column(name = "SUPPORTS_HOMING")
+            private boolean supportsHoming;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+     
+         /**
+         * Gets the SupportsHoming.
+         *
+         * return the SupportsHoming
+         */
+         @Bindable
+         public boolean isSupportsHoming()
+         {
+            return supportsHoming;
+         }
+
+         /**
+         * Sets the SupportsHoming.
+         *
+         * @param supportsHoming the SupportsHoming
+         */
+         public void setSupportsHoming(boolean supportsHoming)
+         {
+            this.supportsHoming = supportsHoming;
+            notifyPropertyChanged(BR.supportsHoming);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java
index 4f9e9db43..8b577e74c 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValf.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "TECH_VALVES", database = TangoDB.class, cachingEnabled = true)
+public class TechValf extends TechValfBase
+{
 
-    @Table(name = "TECH_VALVES", database = TangoDB.class)
-    public class TechValf extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValfBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValfBase.java
new file mode 100644
index 000000000..40e726e7a
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/TechValfBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class TechValfBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java
index befefe2be..11f23f1e2 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java
@@ -1,186 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "USERS", database = TangoDB.class, cachingEnabled = true)
+public class User extends UserBase
+{
 
-    @Table(name = "USERS", database = TangoDB.class)
-    public class User extends Entity 
-    {
     
-            @Column(name = "DELETED")
-            private boolean deleted;
-
-    
-    
-            @Column(name = "EMAIL")
-            private String email;
-
-    
-    
-            @Column(name = "PASSWORD")
-            private String password;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "ADDRESS_GUID", foreignKeyColumnName = "GUID")})
-            private Address address;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONTACT_GUID", foreignKeyColumnName = "GUID")})
-            private Contact contact;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "ORGANIZATION_GUID", foreignKeyColumnName = "GUID")})
-            private Organization organization;
-
-    
-
-     
-         /**
-         * Gets the Deleted.
-         *
-         * return the Deleted
-         */
-         @Bindable
-         public boolean isDeleted()
-         {
-            return deleted;
-         }
-
-         /**
-         * Sets the Deleted.
-         *
-         * @param deleted the Deleted
-         */
-         public void setDeleted(boolean deleted)
-         {
-            this.deleted = deleted;
-            notifyPropertyChanged(BR.deleted);
-         }
-     
-     
-         /**
-         * Gets the Email.
-         *
-         * return the Email
-         */
-         @Bindable
-         public String getEmail()
-         {
-            return email;
-         }
-
-         /**
-         * Sets the Email.
-         *
-         * @param email the Email
-         */
-         public void setEmail(String email)
-         {
-            this.email = email;
-            notifyPropertyChanged(BR.email);
-         }
-     
-     
-         /**
-         * Gets the Password.
-         *
-         * return the Password
-         */
-         @Bindable
-         public String getPassword()
-         {
-            return password;
-         }
-
-         /**
-         * Sets the Password.
-         *
-         * @param password the Password
-         */
-         public void setPassword(String password)
-         {
-            this.password = password;
-            notifyPropertyChanged(BR.password);
-         }
-     
-     
-         /**
-         * Gets the Address.
-         *
-         * return the Address
-         */
-         @Bindable
-         public Address getAddress()
-         {
-            return address;
-         }
-
-         /**
-         * Sets the Address.
-         *
-         * @param address the Address
-         */
-         public void setAddress(Address address)
-         {
-            this.address = address;
-            notifyPropertyChanged(BR.address);
-         }
-     
-     
-         /**
-         * Gets the Contact.
-         *
-         * return the Contact
-         */
-         @Bindable
-         public Contact getContact()
-         {
-            return contact;
-         }
-
-         /**
-         * Sets the Contact.
-         *
-         * @param contact the Contact
-         */
-         public void setContact(Contact contact)
-         {
-            this.contact = contact;
-            notifyPropertyChanged(BR.contact);
-         }
-     
-     
-         /**
-         * Gets the Organization.
-         *
-         * return the Organization
-         */
-         @Bindable
-         public Organization getOrganization()
-         {
-            return organization;
-         }
-
-         /**
-         * Sets the Organization.
-         *
-         * @param organization the Organization
-         */
-         public void setOrganization(Organization organization)
-         {
-            this.organization = organization;
-            notifyPropertyChanged(BR.organization);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UserBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UserBase.java
new file mode 100644
index 000000000..d2f741dec
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UserBase.java
@@ -0,0 +1,183 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class UserBase extends Entity 
+    {
+    
+            @Column(name = "DELETED")
+            private boolean deleted;
+
+    
+    
+            @Column(name = "EMAIL")
+            private String email;
+
+    
+    
+            @Column(name = "PASSWORD")
+            private String password;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "ADDRESS_GUID", foreignKeyColumnName = "GUID")})
+            private Address address;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONTACT_GUID", foreignKeyColumnName = "GUID")})
+            private Contact contact;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "ORGANIZATION_GUID", foreignKeyColumnName = "GUID")})
+            private Organization organization;
+
+    
+
+     
+         /**
+         * Gets the Deleted.
+         *
+         * return the Deleted
+         */
+         @Bindable
+         public boolean isDeleted()
+         {
+            return deleted;
+         }
+
+         /**
+         * Sets the Deleted.
+         *
+         * @param deleted the Deleted
+         */
+         public void setDeleted(boolean deleted)
+         {
+            this.deleted = deleted;
+            notifyPropertyChanged(BR.deleted);
+         }
+     
+     
+         /**
+         * Gets the Email.
+         *
+         * return the Email
+         */
+         @Bindable
+         public String getEmail()
+         {
+            return email;
+         }
+
+         /**
+         * Sets the Email.
+         *
+         * @param email the Email
+         */
+         public void setEmail(String email)
+         {
+            this.email = email;
+            notifyPropertyChanged(BR.email);
+         }
+     
+     
+         /**
+         * Gets the Password.
+         *
+         * return the Password
+         */
+         @Bindable
+         public String getPassword()
+         {
+            return password;
+         }
+
+         /**
+         * Sets the Password.
+         *
+         * @param password the Password
+         */
+         public void setPassword(String password)
+         {
+            this.password = password;
+            notifyPropertyChanged(BR.password);
+         }
+     
+     
+         /**
+         * Gets the Address.
+         *
+         * return the Address
+         */
+         @Bindable
+         public Address getAddress()
+         {
+            return address;
+         }
+
+         /**
+         * Sets the Address.
+         *
+         * @param address the Address
+         */
+         public void setAddress(Address address)
+         {
+            this.address = address;
+            notifyPropertyChanged(BR.address);
+         }
+     
+     
+         /**
+         * Gets the Contact.
+         *
+         * return the Contact
+         */
+         @Bindable
+         public Contact getContact()
+         {
+            return contact;
+         }
+
+         /**
+         * Sets the Contact.
+         *
+         * @param contact the Contact
+         */
+         public void setContact(Contact contact)
+         {
+            this.contact = contact;
+            notifyPropertyChanged(BR.contact);
+         }
+     
+     
+         /**
+         * Gets the Organization.
+         *
+         * return the Organization
+         */
+         @Bindable
+         public Organization getOrganization()
+         {
+            return organization;
+         }
+
+         /**
+         * Sets the Organization.
+         *
+         * @param organization the Organization
+         */
+         public void setOrganization(Organization organization)
+         {
+            this.organization = organization;
+            notifyPropertyChanged(BR.organization);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java
index 79b78e788..4846c6f74 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "USERS_ROLES", database = TangoDB.class, cachingEnabled = true)
+public class UsersRole extends UsersRoleBase
+{
 
-    @Table(name = "USERS_ROLES", database = TangoDB.class)
-    public class UsersRole extends Entity 
-    {
     
-            @Column(name = "DELETED")
-            private boolean deleted;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "ROLE_GUID", foreignKeyColumnName = "GUID")})
-            private Role role;
-
-    
-    
-            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
-            private User user;
-
-    
-
-     
-         /**
-         * Gets the Deleted.
-         *
-         * return the Deleted
-         */
-         @Bindable
-         public boolean isDeleted()
-         {
-            return deleted;
-         }
-
-         /**
-         * Sets the Deleted.
-         *
-         * @param deleted the Deleted
-         */
-         public void setDeleted(boolean deleted)
-         {
-            this.deleted = deleted;
-            notifyPropertyChanged(BR.deleted);
-         }
-     
-     
-         /**
-         * Gets the Role.
-         *
-         * return the Role
-         */
-         @Bindable
-         public Role getRole()
-         {
-            return role;
-         }
-
-         /**
-         * Sets the Role.
-         *
-         * @param role the Role
-         */
-         public void setRole(Role role)
-         {
-            this.role = role;
-            notifyPropertyChanged(BR.role);
-         }
-     
-     
-         /**
-         * Gets the User.
-         *
-         * return the User
-         */
-         @Bindable
-         public User getUser()
-         {
-            return user;
-         }
-
-         /**
-         * Sets the User.
-         *
-         * @param user the User
-         */
-         public void setUser(User user)
-         {
-            this.user = user;
-            notifyPropertyChanged(BR.user);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRoleBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRoleBase.java
new file mode 100644
index 000000000..20025896f
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRoleBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class UsersRoleBase extends Entity 
+    {
+    
+            @Column(name = "DELETED")
+            private boolean deleted;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "ROLE_GUID", foreignKeyColumnName = "GUID")})
+            private Role role;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
+            private User user;
+
+    
+
+     
+         /**
+         * Gets the Deleted.
+         *
+         * return the Deleted
+         */
+         @Bindable
+         public boolean isDeleted()
+         {
+            return deleted;
+         }
+
+         /**
+         * Sets the Deleted.
+         *
+         * @param deleted the Deleted
+         */
+         public void setDeleted(boolean deleted)
+         {
+            this.deleted = deleted;
+            notifyPropertyChanged(BR.deleted);
+         }
+     
+     
+         /**
+         * Gets the Role.
+         *
+         * return the Role
+         */
+         @Bindable
+         public Role getRole()
+         {
+            return role;
+         }
+
+         /**
+         * Sets the Role.
+         *
+         * @param role the Role
+         */
+         public void setRole(Role role)
+         {
+            this.role = role;
+            notifyPropertyChanged(BR.role);
+         }
+     
+     
+         /**
+         * Gets the User.
+         *
+         * return the User
+         */
+         @Bindable
+         public User getUser()
+         {
+            return user;
+         }
+
+         /**
+         * Sets the User.
+         *
+         * @param user the User
+         */
+         public void setUser(User user)
+         {
+            this.user = user;
+            notifyPropertyChanged(BR.user);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java
index 21fab2480..92a0ed10f 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethod.java
@@ -1,102 +1,11 @@
 package com.twine.tango.dal.entities;
 
-import com.raizlabs.android.dbflow.annotation.Column;
-import com.raizlabs.android.dbflow.annotation.ForeignKey;
-import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
 import com.raizlabs.android.dbflow.annotation.Table;
-import org.joda.time.DateTime;
-import com.twine.tango.dal.Entity;
 import com.twine.tango.dal.TangoDB;
-import android.databinding.Bindable;
-import com.twine.tango.dal.BR;
 
+@Table(name = "WINDING_METHODS", database = TangoDB.class, cachingEnabled = true)
+public class WindingMethod extends WindingMethodBase
+{
 
-    @Table(name = "WINDING_METHODS", database = TangoDB.class)
-    public class WindingMethod extends Entity 
-    {
     
-            @Column(name = "CODE")
-            private int code;
-
-    
-    
-            @Column(name = "NAME")
-            private String name;
-
-    
-    
-            @Column(name = "DESCRIPTION")
-            private String description;
-
-    
-
-     
-         /**
-         * Gets the Code.
-         *
-         * return the Code
-         */
-         @Bindable
-         public int getCode()
-         {
-            return code;
-         }
-
-         /**
-         * Sets the Code.
-         *
-         * @param code the Code
-         */
-         public void setCode(int code)
-         {
-            this.code = code;
-            notifyPropertyChanged(BR.code);
-         }
-     
-     
-         /**
-         * Gets the Name.
-         *
-         * return the Name
-         */
-         @Bindable
-         public String getName()
-         {
-            return name;
-         }
-
-         /**
-         * Sets the Name.
-         *
-         * @param name the Name
-         */
-         public void setName(String name)
-         {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-         }
-     
-     
-         /**
-         * Gets the Description.
-         *
-         * return the Description
-         */
-         @Bindable
-         public String getDescription()
-         {
-            return description;
-         }
-
-         /**
-         * Sets the Description.
-         *
-         * @param description the Description
-         */
-         public void setDescription(String description)
-         {
-            this.description = description;
-            notifyPropertyChanged(BR.description);
-         }
-     
-    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethodBase.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethodBase.java
new file mode 100644
index 000000000..08a35c7fa
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/WindingMethodBase.java
@@ -0,0 +1,99 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Column;
+import com.raizlabs.android.dbflow.annotation.ForeignKey;
+import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
+import org.joda.time.DateTime;
+import com.twine.tango.dal.Entity;
+import android.databinding.Bindable;
+import com.twine.tango.dal.BR;
+
+
+    public abstract class WindingMethodBase extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         @Bindable
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+            notifyPropertyChanged(BR.code);
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         @Bindable
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+            notifyPropertyChanged(BR.name);
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         @Bindable
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+            notifyPropertyChanged(BR.description);
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.UnitTesting/build.gradle b/Software/Android_Studio/Tango.UnitTesting/build.gradle
index a785e4580..cb108d466 100644
--- a/Software/Android_Studio/Tango.UnitTesting/build.gradle
+++ b/Software/Android_Studio/Tango.UnitTesting/build.gradle
@@ -28,6 +28,10 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    dataBinding {
+        enabled = true
+    }
 }
 
 dependencies {
diff --git a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java
index 3e020b363..5decde1d6 100644
--- a/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java
+++ b/Software/Android_Studio/Tango.UnitTesting/src/androidTest/java/com/twine/tango/unittesting/DAL_TST.java
@@ -4,9 +4,20 @@ import android.content.Context;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
 
+import com.raizlabs.android.dbflow.config.FlowManager;
+import com.twine.tango.dal.TangoDB;
+import com.twine.tango.dal.dao.TangoDAO;
+import com.twine.tango.dal.entities.ActionType;
+import com.twine.tango.dal.entities.EventType;
+import com.twine.tango.dal.entities.EventTypesAction;
+import com.twine.tango.dal.entities.Organization;
+import com.twine.tango.logging.LogManager;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.List;
+
 /**
  * Created by Roy on 12/19/2017.
  */
@@ -19,5 +30,52 @@ public class DAL_TST
     {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
+    
+        List<EventType> events = TangoDAO.getAllEventTypes();
+    
+        for (EventType ev: events)
+        {
+            List<ActionType> actionTypes = ev.getActionTypes();
+    
+            for (ActionType action :
+                    actionTypes)
+            {
+                LogManager.getDefault().log(action.getDescription());
+            }
+        }
+    
+        LogManager.getDefault().log("Done!");
+    }
+    
+    @Test
+    public void add_machine()
+    {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+        
+        List<Organization> organizations = TangoDAO.getAllOrganizations();
+        
+//        if (organizations.size() == 0)
+//        {
+
+            
+            FlowManager.getDatabase(TangoDB.class).executeTransaction((wrapper) ->
+            {
+    
+                Organization org = new Organization();
+                org.setName("Twine 2");
+                org.getAddress().save(wrapper).blockingGet();
+                org.getContact().save(wrapper).blockingGet();
+                org.save(wrapper).blockingGet();
+                
+            });
+            
+            //FlowManager.getModelAdapter(MyTable.class).saveAll(myObjectsList); //For machine events....
+            
+//        }
+        
+        organizations = TangoDAO.getAllOrganizations();
+        
+        int a = 5;
     }
 }
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index 70461b5e5..dffd44cc8 100644
--- a/Software/DB/Tango.mdf
+++ b/Software/DB/Tango.mdf
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 35c2fd277..31d037183 100644
--- a/Software/DB/Tango_log.ldf
+++ b/Software/DB/Tango_log.ldf
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFileJava.cs b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFileJava.cs
index 194cd0fc1..0ff4f47d0 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFileJava.cs
+++ b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFileJava.cs
@@ -10,7 +10,7 @@ namespace Tango.CodeGeneration
     /// Represents a database entity Java code file.
     /// </summary>
     /// <seealso cref="Tango.CodeGeneration.Class" />
-    public class EntityCodeFileJava : Class
+    public class EntityCodeFileJava : Class 
     {
         /// <summary>
         /// Gets or sets the name of the entity.
@@ -18,6 +18,11 @@ namespace Tango.CodeGeneration
         public String EntityName { get; set; }
 
         /// <summary>
+        /// Gets or sets the extends.
+        /// </summary>
+        public String Extends { get; set; }
+
+        /// <summary>
         /// Gets or sets the name of the table.
         /// </summary>
         public String TableName { get; set; }
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFileJavaExtension.cs b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFileJavaExtension.cs
new file mode 100644
index 000000000..99ea437a6
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CodeGeneration/EntityCodeFileJavaExtension.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.CodeGeneration
+{
+    /// <summary>
+    /// Represents a database entity Java code file.
+    /// </summary>
+    /// <seealso cref="Tango.CodeGeneration.Class" />
+    public class EntityCodeFileJavaExtension : Class
+    {
+        /// <summary>
+        /// Gets or sets the extends.
+        /// </summary>
+        public String Extends { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the table.
+        /// </summary>
+        public String TableName { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EntityCodeFileJavaExtension"/> class.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        public EntityCodeFileJavaExtension(String name, String extends) : base(name)
+        {
+            Extends = extends;
+        }
+    }
+}
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
index 3c6c9d085..db77d9f20 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Tango.CodeGeneration.csproj
@@ -64,6 +64,7 @@
     <Compile Include="CodeFile.cs" />
     <Compile Include="CodeObject.cs" />
     <Compile Include="DpProperty.cs" />
+    <Compile Include="EntityCodeFileJavaExtension.cs" />
     <Compile Include="EntityCodeFileJava.cs" />
     <Compile Include="EntityCodeFile.cs" />
     <Compile Include="EnumerationField.cs" />
@@ -111,6 +112,7 @@
     <EmbeddedResource Include="Templates\ObservablesContextCodeFile.cshtml" />
     <EmbeddedResource Include="Templates\ProtoMessageFile.cshtml" />
     <EmbeddedResource Include="Templates\ProtoEnumFile.cshtml" />
+    <EmbeddedResource Include="Templates\EntityCodeFileJavaExtension.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFileJava.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFileJava.cshtml
index 87c82395b..d9200a718 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFileJava.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFileJava.cshtml
@@ -3,16 +3,13 @@
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.ForeignKey;
 import com.raizlabs.android.dbflow.annotation.ForeignKeyReference;
-import com.raizlabs.android.dbflow.annotation.Table;
 import org.joda.time.DateTime;
 import com.twine.tango.dal.Entity;
-import com.twine.tango.dal.TangoDB;
 import android.databinding.Bindable;
 import com.twine.tango.dal.BR;
 
 
-    @@Table(name = "@(Model.TableName)", database = TangoDB.class)
-    public class @(Model.Name) extends Entity 
+    public abstract class @(Model.Name) extends Entity 
     {
         @foreach (var prop in Model.Fields)
         {
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFileJavaExtension.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFileJavaExtension.cshtml
new file mode 100644
index 000000000..8498f3311
--- /dev/null
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/EntityCodeFileJavaExtension.cshtml
@@ -0,0 +1,11 @@
+package com.twine.tango.dal.entities;
+
+import com.raizlabs.android.dbflow.annotation.Table;
+import com.twine.tango.dal.TangoDB;
+
+@@Table(name = "@(Model.TableName)", database = TangoDB.class, cachingEnabled = true)
+public class @(Model.Name) extends @(Model.Extends)
+{
+
+    
+}
diff --git a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs
index ba950f3db..75cfffe50 100644
--- a/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs
+++ b/Software/Visual_Studio/Utilities/Tango.DBObservablesGenerator.CLI/ObservablesGenerator.cs
@@ -194,13 +194,16 @@ namespace Tango.DBObservablesGenerator.CLI
             //Generate Entities...
             foreach (var table in typeof(RemoteDB).GetProperties().Where(x => typeof(IEnumerable).IsAssignableFrom(x.PropertyType)))
             {
-                EntityCodeFileJava codeFile = new EntityCodeFileJava(DalNameToStandardName(table.Name).Singularize(false))
+                EntityCodeFileJava codeFile = new EntityCodeFileJava(DalNameToStandardName(table.Name).Singularize(false) + "Base")
                 {
                     EntityName = table.Name.Singularize(false),
                     TableName = table.Name,
                 };
 
-
+                EntityCodeFileJavaExtension extensionCodeFile = new EntityCodeFileJavaExtension(DalNameToStandardName(table.Name).Singularize(false), codeFile.Name)
+                {
+                    TableName = table.Name
+                };
 
                 foreach (var field in table.PropertyType.GenericTypeArguments.First().GetProperties().Skip(3).Where(x => !x.Name.Contains("GUID")))
                 {
@@ -227,6 +230,9 @@ namespace Tango.DBObservablesGenerator.CLI
                         {
                             codeField.Type = DalNameToStandardName(field.PropertyType.Name).Singularize(false);
                             codeField.Construct = true;
+                            codeField.FieldName = codeField.FieldName.Singularize(false).ToUpper();
+                            codeField.Description = codeField.Description.Singularize(false);
+                            codeField.Name = codeField.Type;
                         }
                         else if (field.PropertyType == typeof(Byte[]) || field.PropertyType == typeof(Boolean) || field.PropertyType == typeof(Double))
                         {
@@ -242,11 +248,20 @@ namespace Tango.DBObservablesGenerator.CLI
                 }
 
                 codeFile.IndentResult = false;
+                extensionCodeFile.IndentResult = false;
                 String code = codeFile.GenerateCode();
+                String extensionCode = extensionCodeFile.GenerateCode();
 
                 String entitiesPath = Path.Combine(targetPath, "entities");
                 Directory.CreateDirectory(entitiesPath);
                 File.WriteAllText(Path.Combine(entitiesPath, codeFile.Name + ".java"), code);
+
+                String extensionCodeFilePath = Path.Combine(entitiesPath, extensionCodeFile.Name + ".java");
+
+                if (!File.Exists(extensionCodeFilePath))
+                {
+                    File.WriteAllText(extensionCodeFilePath, extensionCode);
+                }
             }
             //Generate Entities...