MERGE.

58 files changed, 4605 insertions, 411 deletions

diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java
new file mode 100644
index 000000000..165d0f161
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/DateConverter.java
@@ -0,0 +1,35 @@
+package com.twine.tango.dal;
+import com.raizlabs.android.dbflow.converter.TypeConverter;
+import com.twine.tango.dal.enumerations.EnumDemo;
+
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+
+/**
+ * Represents a DBFlow string to date converter used to parse and store SQLite dates.
+ */
+@com.raizlabs.android.dbflow.annotation.TypeConverter
+public class DateConverter extends TypeConverter<String,DateTime>
+{
+    
+    @Override
+    public String getDBValue(DateTime model)
+    {
+        DateTimeFormatter dtfOut = DateTimeFormat.forPattern("yyyy-MM-dd hh:mm:ss");
+        return dtfOut.print(model);
+    }
+    
+    @Override
+    public DateTime getModelValue(String data)
+    {
+        DateTimeFormatter dtf = DateTimeFormat.forPattern("yyyy-MM-dd hh:mm:ss");
+        DateTime jodatime = dtf.parseDateTime(data);
+        return jodatime;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Entity.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
index 64b24b00c..fd41d9230 100644
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Entity.java
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/Entity.java
@@ -1,10 +1,12 @@
-package com.twine.tango.dal.entities;
+package com.twine.tango.dal;
 
 import com.raizlabs.android.dbflow.annotation.Column;
 import com.raizlabs.android.dbflow.annotation.PrimaryKey;
 import com.raizlabs.android.dbflow.rx2.structure.BaseRXModel;
 
-import java.util.Date;
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+
 import java.util.UUID;
 
 
@@ -22,7 +24,7 @@ public class Entity extends BaseRXModel
     private String guid;
     
     @Column(name = "LAST_UPDATED",typeConverter = DateConverter.class)
-    private Date last_updated;
+    private DateTime last_updated;
     
     @Column(name = "DELETED")
     private boolean deleted;
@@ -72,7 +74,7 @@ public class Entity extends BaseRXModel
      *
      * @return the last updated
      */
-    public Date getLast_updated()
+    public DateTime getLast_updated()
     {
         return last_updated;
     }
@@ -82,7 +84,7 @@ public class Entity extends BaseRXModel
      *
      * @param last_updated the last updated
      */
-    public void setLast_updated(Date last_updated)
+    public void setLast_updated(DateTime last_updated)
     {
         this.last_updated = last_updated;
     }
@@ -113,6 +115,6 @@ public class Entity extends BaseRXModel
     public Entity()
     {
         setGuid(UUID.randomUUID().toString());
-        setLast_updated(new Date());
+        setLast_updated(DateTime.now(DateTimeZone.UTC));
     }
 }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/OrganizationsDAO.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/OrganizationsDAO.java
deleted file mode 100644
index 2fb669bbb..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/OrganizationsDAO.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.twine.tango.dal.dao;
-
-import com.raizlabs.android.dbflow.sql.language.SQLite;
-import com.twine.tango.dal.entities.Organization;
-
-import java.util.List;
-
-/**
- * Created by Roy on 12/2/2017.
- */
-
-public class OrganizationsDAO
-{
-    public static List<Organization> getAllOrganizations()
-    {
-        return SQLite.select().from(Organization.class).queryList();
-    }
-}
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
new file mode 100644
index 000000000..e02fc0b3f
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/dao/TangoDAO.java
@@ -0,0 +1,438 @@
+package com.twine.tango.dal.dao;
+
+import com.raizlabs.android.dbflow.sql.language.SQLite;
+import com.twine.tango.dal.entities.Action;
+import com.twine.tango.dal.entities.Address;
+import com.twine.tango.dal.entities.ApplicationDisplayPanelVersion;
+import com.twine.tango.dal.entities.ApplicationFirmwareVersion;
+import com.twine.tango.dal.entities.ApplicationOsVersion;
+import com.twine.tango.dal.entities.ApplicationVersion;
+import com.twine.tango.dal.entities.CartridgeType;
+import com.twine.tango.dal.entities.Cartridge;
+import com.twine.tango.dal.entities.Configuration;
+import com.twine.tango.dal.entities.Contact;
+import com.twine.tango.dal.entities.DispenserType;
+import com.twine.tango.dal.entities.Dispenser;
+import com.twine.tango.dal.entities.EmbeddedFirmwareVersion;
+import com.twine.tango.dal.entities.EmbeddedSoftwareVersion;
+import com.twine.tango.dal.entities.Event;
+import com.twine.tango.dal.entities.EventsAction;
+import com.twine.tango.dal.entities.FiberShape;
+import com.twine.tango.dal.entities.FiberSynth;
+import com.twine.tango.dal.entities.HardwareVersion;
+import com.twine.tango.dal.entities.IdsPack;
+import com.twine.tango.dal.entities.LinearMassDensityUnit;
+import com.twine.tango.dal.entities.Liquid;
+import com.twine.tango.dal.entities.LiquidsRml;
+import com.twine.tango.dal.entities.MachineVersion;
+import com.twine.tango.dal.entities.Machine;
+import com.twine.tango.dal.entities.MachinesConfiguration;
+import com.twine.tango.dal.entities.MachinesEvent;
+import com.twine.tango.dal.entities.MediaColor;
+import com.twine.tango.dal.entities.MediaCondition;
+import com.twine.tango.dal.entities.MediaMaterial;
+import com.twine.tango.dal.entities.MediaPurpose;
+import com.twine.tango.dal.entities.Organization;
+import com.twine.tango.dal.entities.Permission;
+import com.twine.tango.dal.entities.Rml;
+import com.twine.tango.dal.entities.Role;
+import com.twine.tango.dal.entities.RolesPermission;
+import com.twine.tango.dal.entities.SyncConfiguration;
+import com.twine.tango.dal.entities.User;
+import com.twine.tango.dal.entities.UsersRole;
+import java.util.List;
+
+public class TangoDAO
+{
+
+    /**
+    * Gets all the Actions from database.
+    *
+    * @return all Actions
+    */
+    public static List<Action> getAllActions()
+    {
+        return SQLite.select().from(Action.class).queryList();
+    }
+
+    /**
+    * Gets all the Addresses from database.
+    *
+    * @return all Addresses
+    */
+    public static List<Address> getAllAddresses()
+    {
+        return SQLite.select().from(Address.class).queryList();
+    }
+
+    /**
+    * Gets all the ApplicationDisplayPanelVersions from database.
+    *
+    * @return all ApplicationDisplayPanelVersions
+    */
+    public static List<ApplicationDisplayPanelVersion> getAllApplicationDisplayPanelVersions()
+    {
+        return SQLite.select().from(ApplicationDisplayPanelVersion.class).queryList();
+    }
+
+    /**
+    * Gets all the ApplicationFirmwareVersions from database.
+    *
+    * @return all ApplicationFirmwareVersions
+    */
+    public static List<ApplicationFirmwareVersion> getAllApplicationFirmwareVersions()
+    {
+        return SQLite.select().from(ApplicationFirmwareVersion.class).queryList();
+    }
+
+    /**
+    * Gets all the ApplicationOsVersions from database.
+    *
+    * @return all ApplicationOsVersions
+    */
+    public static List<ApplicationOsVersion> getAllApplicationOsVersions()
+    {
+        return SQLite.select().from(ApplicationOsVersion.class).queryList();
+    }
+
+    /**
+    * Gets all the ApplicationVersions from database.
+    *
+    * @return all ApplicationVersions
+    */
+    public static List<ApplicationVersion> getAllApplicationVersions()
+    {
+        return SQLite.select().from(ApplicationVersion.class).queryList();
+    }
+
+    /**
+    * Gets all the CartridgeTypes from database.
+    *
+    * @return all CartridgeTypes
+    */
+    public static List<CartridgeType> getAllCartridgeTypes()
+    {
+        return SQLite.select().from(CartridgeType.class).queryList();
+    }
+
+    /**
+    * Gets all the Cartridges from database.
+    *
+    * @return all Cartridges
+    */
+    public static List<Cartridge> getAllCartridges()
+    {
+        return SQLite.select().from(Cartridge.class).queryList();
+    }
+
+    /**
+    * Gets all the Configurations from database.
+    *
+    * @return all Configurations
+    */
+    public static List<Configuration> getAllConfigurations()
+    {
+        return SQLite.select().from(Configuration.class).queryList();
+    }
+
+    /**
+    * Gets all the Contacts from database.
+    *
+    * @return all Contacts
+    */
+    public static List<Contact> getAllContacts()
+    {
+        return SQLite.select().from(Contact.class).queryList();
+    }
+
+    /**
+    * Gets all the DispenserTypes from database.
+    *
+    * @return all DispenserTypes
+    */
+    public static List<DispenserType> getAllDispenserTypes()
+    {
+        return SQLite.select().from(DispenserType.class).queryList();
+    }
+
+    /**
+    * Gets all the Dispensers from database.
+    *
+    * @return all Dispensers
+    */
+    public static List<Dispenser> getAllDispensers()
+    {
+        return SQLite.select().from(Dispenser.class).queryList();
+    }
+
+    /**
+    * Gets all the EmbeddedFirmwareVersions from database.
+    *
+    * @return all EmbeddedFirmwareVersions
+    */
+    public static List<EmbeddedFirmwareVersion> getAllEmbeddedFirmwareVersions()
+    {
+        return SQLite.select().from(EmbeddedFirmwareVersion.class).queryList();
+    }
+
+    /**
+    * Gets all the EmbeddedSoftwareVersions from database.
+    *
+    * @return all EmbeddedSoftwareVersions
+    */
+    public static List<EmbeddedSoftwareVersion> getAllEmbeddedSoftwareVersions()
+    {
+        return SQLite.select().from(EmbeddedSoftwareVersion.class).queryList();
+    }
+
+    /**
+    * Gets all the Events from database.
+    *
+    * @return all Events
+    */
+    public static List<Event> getAllEvents()
+    {
+        return SQLite.select().from(Event.class).queryList();
+    }
+
+    /**
+    * Gets all the EventsActions from database.
+    *
+    * @return all EventsActions
+    */
+    public static List<EventsAction> getAllEventsActions()
+    {
+        return SQLite.select().from(EventsAction.class).queryList();
+    }
+
+    /**
+    * Gets all the FiberShapes from database.
+    *
+    * @return all FiberShapes
+    */
+    public static List<FiberShape> getAllFiberShapes()
+    {
+        return SQLite.select().from(FiberShape.class).queryList();
+    }
+
+    /**
+    * Gets all the FiberSynths from database.
+    *
+    * @return all FiberSynths
+    */
+    public static List<FiberSynth> getAllFiberSynths()
+    {
+        return SQLite.select().from(FiberSynth.class).queryList();
+    }
+
+    /**
+    * Gets all the HardwareVersions from database.
+    *
+    * @return all HardwareVersions
+    */
+    public static List<HardwareVersion> getAllHardwareVersions()
+    {
+        return SQLite.select().from(HardwareVersion.class).queryList();
+    }
+
+    /**
+    * Gets all the IdsPacks from database.
+    *
+    * @return all IdsPacks
+    */
+    public static List<IdsPack> getAllIdsPacks()
+    {
+        return SQLite.select().from(IdsPack.class).queryList();
+    }
+
+    /**
+    * Gets all the LinearMassDensityUnits from database.
+    *
+    * @return all LinearMassDensityUnits
+    */
+    public static List<LinearMassDensityUnit> getAllLinearMassDensityUnits()
+    {
+        return SQLite.select().from(LinearMassDensityUnit.class).queryList();
+    }
+
+    /**
+    * Gets all the Liquids from database.
+    *
+    * @return all Liquids
+    */
+    public static List<Liquid> getAllLiquids()
+    {
+        return SQLite.select().from(Liquid.class).queryList();
+    }
+
+    /**
+    * Gets all the LiquidsRmls from database.
+    *
+    * @return all LiquidsRmls
+    */
+    public static List<LiquidsRml> getAllLiquidsRmls()
+    {
+        return SQLite.select().from(LiquidsRml.class).queryList();
+    }
+
+    /**
+    * Gets all the MachineVersions from database.
+    *
+    * @return all MachineVersions
+    */
+    public static List<MachineVersion> getAllMachineVersions()
+    {
+        return SQLite.select().from(MachineVersion.class).queryList();
+    }
+
+    /**
+    * Gets all the Machines from database.
+    *
+    * @return all Machines
+    */
+    public static List<Machine> getAllMachines()
+    {
+        return SQLite.select().from(Machine.class).queryList();
+    }
+
+    /**
+    * Gets all the MachinesConfigurations from database.
+    *
+    * @return all MachinesConfigurations
+    */
+    public static List<MachinesConfiguration> getAllMachinesConfigurations()
+    {
+        return SQLite.select().from(MachinesConfiguration.class).queryList();
+    }
+
+    /**
+    * Gets all the MachinesEvents from database.
+    *
+    * @return all MachinesEvents
+    */
+    public static List<MachinesEvent> getAllMachinesEvents()
+    {
+        return SQLite.select().from(MachinesEvent.class).queryList();
+    }
+
+    /**
+    * Gets all the MediaColors from database.
+    *
+    * @return all MediaColors
+    */
+    public static List<MediaColor> getAllMediaColors()
+    {
+        return SQLite.select().from(MediaColor.class).queryList();
+    }
+
+    /**
+    * Gets all the MediaConditions from database.
+    *
+    * @return all MediaConditions
+    */
+    public static List<MediaCondition> getAllMediaConditions()
+    {
+        return SQLite.select().from(MediaCondition.class).queryList();
+    }
+
+    /**
+    * Gets all the MediaMaterials from database.
+    *
+    * @return all MediaMaterials
+    */
+    public static List<MediaMaterial> getAllMediaMaterials()
+    {
+        return SQLite.select().from(MediaMaterial.class).queryList();
+    }
+
+    /**
+    * Gets all the MediaPurposes from database.
+    *
+    * @return all MediaPurposes
+    */
+    public static List<MediaPurpose> getAllMediaPurposes()
+    {
+        return SQLite.select().from(MediaPurpose.class).queryList();
+    }
+
+    /**
+    * Gets all the Organizations from database.
+    *
+    * @return all Organizations
+    */
+    public static List<Organization> getAllOrganizations()
+    {
+        return SQLite.select().from(Organization.class).queryList();
+    }
+
+    /**
+    * Gets all the Permissions from database.
+    *
+    * @return all Permissions
+    */
+    public static List<Permission> getAllPermissions()
+    {
+        return SQLite.select().from(Permission.class).queryList();
+    }
+
+    /**
+    * Gets all the Rmls from database.
+    *
+    * @return all Rmls
+    */
+    public static List<Rml> getAllRmls()
+    {
+        return SQLite.select().from(Rml.class).queryList();
+    }
+
+    /**
+    * Gets all the Roles from database.
+    *
+    * @return all Roles
+    */
+    public static List<Role> getAllRoles()
+    {
+        return SQLite.select().from(Role.class).queryList();
+    }
+
+    /**
+    * Gets all the RolesPermissions from database.
+    *
+    * @return all RolesPermissions
+    */
+    public static List<RolesPermission> getAllRolesPermissions()
+    {
+        return SQLite.select().from(RolesPermission.class).queryList();
+    }
+
+    /**
+    * Gets all the SyncConfigurations from database.
+    *
+    * @return all SyncConfigurations
+    */
+    public static List<SyncConfiguration> getAllSyncConfigurations()
+    {
+        return SQLite.select().from(SyncConfiguration.class).queryList();
+    }
+
+    /**
+    * Gets all the Users from database.
+    *
+    * @return all Users
+    */
+    public static List<User> getAllUsers()
+    {
+        return SQLite.select().from(User.class).queryList();
+    }
+
+    /**
+    * Gets all the UsersRoles from database.
+    *
+    * @return all UsersRoles
+    */
+    public static List<UsersRole> getAllUsersRoles()
+    {
+        return SQLite.select().from(UsersRole.class).queryList();
+    }
+
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Action.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Action.java
new file mode 100644
index 000000000..ac0cb892f
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Action.java
@@ -0,0 +1,94 @@
+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;
+
+
+    @Table(name = "ACTIONS", database = TangoDB.class)
+    public class Action 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
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = 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 116f1af88..199d8f923 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,174 +1,198 @@
 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;
 
 
-/**
- * Represents the DAL Address entity.
- */
-@Table(name = "ADDRESSES", database = TangoDB.class)
-public class Address extends Entity
-{
-    @Column(name = "ADDRESS")
-    private String address;
-    
-    @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 country_code;
-    
-    @Column(name = "POSTAL_CODE")
-    private String postal_code;
-    
-    /**
-     * Gets the address.
-     *
-     * @return the address
-     */
-    public String getAddress()
+    @Table(name = "ADDRESSES", database = TangoDB.class)
+    public class Address extends Entity 
     {
-        return address;
-    }
     
-    /**
-     * Sets address.
-     *
-     * @param address the address
-     */
-    public void setAddress(String address)
-    {
-        this.address = address;
-    }
+            @Column(name = "ADDRESS_STRING")
+            private String addressString;
+
     
-    /**
-     * Gets locality.
-     *
-     * @return the locality
-     */
-    public String getLocality()
-    {
-        return locality;
-    }
     
-    /**
-     * Sets locality.
-     *
-     * @param locality the locality
-     */
-    public void setLocality(String locality)
-    {
-        this.locality = locality;
-    }
+            @Column(name = "LOCALITY")
+            private String locality;
+
     
-    /**
-     * Gets country.
-     *
-     * @return the country
-     */
-    public String getCountry()
-    {
-        return country;
-    }
     
-    /**
-     * Sets country.
-     *
-     * @param country the country
-     */
-    public void setCountry(String country)
-    {
-        this.country = country;
-    }
+            @Column(name = "COUNTRY")
+            private String country;
+
     
-    /**
-     * Gets city.
-     *
-     * @return the city
-     */
-    public String getCity()
-    {
-        return city;
-    }
     
-    /**
-     * Sets city.
-     *
-     * @param city the city
-     */
-    public void setCity(String city)
-    {
-        this.city = city;
-    }
+            @Column(name = "CITY")
+            private String city;
+
     
-    /**
-     * Gets state.
-     *
-     * @return the state
-     */
-    public String getState()
-    {
-        return state;
-    }
     
-    /**
-     * Sets state.
-     *
-     * @param state the state
-     */
-    public void setState(String state)
-    {
-        this.state = state;
-    }
+            @Column(name = "STATE")
+            private String state;
+
     
-    /**
-     * Gets country code.
-     *
-     * @return the country code
-     */
-    public String getCountry_code()
-    {
-        return country_code;
-    }
     
-    /**
-     * Sets country code.
-     *
-     * @param country_code the country code
-     */
-    public void setCountry_code(String country_code)
-    {
-        this.country_code = country_code;
-    }
+            @Column(name = "COUNTRY_CODE")
+            private String countryCode;
+
     
-    /**
-     * Gets postal code.
-     *
-     * @return the postal code
-     */
-    public String getPostal_code()
-    {
-        return postal_code;
-    }
     
-    /**
-     * Sets postal code.
-     *
-     * @param postal_code the postal code
-     */
-    public void setPostal_code(String postal_code)
-    {
-        this.postal_code = postal_code;
+            @Column(name = "POSTAL_CODE")
+            private String postalCode;
+
+    
+
+     
+         /**
+         * Gets the AddressString.
+         *
+         * return the AddressString
+         */
+         public String getAddressString()
+         {
+            return addressString;
+         }
+
+         /**
+         * Sets the AddressString.
+         *
+         * @param addressString the AddressString
+         */
+         public void setAddressString(String addressString)
+         {
+            this.addressString = addressString;
+         }
+     
+     
+         /**
+         * Gets the Locality.
+         *
+         * return the Locality
+         */
+         public String getLocality()
+         {
+            return locality;
+         }
+
+         /**
+         * Sets the Locality.
+         *
+         * @param locality the Locality
+         */
+         public void setLocality(String locality)
+         {
+            this.locality = locality;
+         }
+     
+     
+         /**
+         * Gets the Country.
+         *
+         * return the Country
+         */
+         public String getCountry()
+         {
+            return country;
+         }
+
+         /**
+         * Sets the Country.
+         *
+         * @param country the Country
+         */
+         public void setCountry(String country)
+         {
+            this.country = country;
+         }
+     
+     
+         /**
+         * Gets the City.
+         *
+         * return the City
+         */
+         public String getCity()
+         {
+            return city;
+         }
+
+         /**
+         * Sets the City.
+         *
+         * @param city the City
+         */
+         public void setCity(String city)
+         {
+            this.city = city;
+         }
+     
+     
+         /**
+         * Gets the State.
+         *
+         * return the State
+         */
+         public String getState()
+         {
+            return state;
+         }
+
+         /**
+         * Sets the State.
+         *
+         * @param state the State
+         */
+         public void setState(String state)
+         {
+            this.state = state;
+         }
+     
+     
+         /**
+         * Gets the CountryCode.
+         *
+         * return the CountryCode
+         */
+         public String getCountryCode()
+         {
+            return countryCode;
+         }
+
+         /**
+         * Sets the CountryCode.
+         *
+         * @param countryCode the CountryCode
+         */
+         public void setCountryCode(String countryCode)
+         {
+            this.countryCode = countryCode;
+         }
+     
+     
+         /**
+         * Gets the PostalCode.
+         *
+         * return the PostalCode
+         */
+         public String getPostalCode()
+         {
+            return postalCode;
+         }
+
+         /**
+         * Sets the PostalCode.
+         *
+         * @param postalCode the PostalCode
+         */
+         public void setPostalCode(String postalCode)
+         {
+            this.postalCode = 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
new file mode 100644
index 000000000..d046d063f
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationDisplayPanelVersion.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public Double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(Double version)
+         {
+            this.version = version;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = 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
new file mode 100644
index 000000000..6a417c5c0
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationFirmwareVersion.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public Double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(Double version)
+         {
+            this.version = version;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = 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
new file mode 100644
index 000000000..0b443a664
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationOsVersion.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public Double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(Double version)
+         {
+            this.version = version;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = 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
new file mode 100644
index 000000000..05c7e75b5
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/ApplicationVersion.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public Double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(Double version)
+         {
+            this.version = version;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cartridge.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cartridge.java
new file mode 100644
index 000000000..8bb0deea8
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Cartridge.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @Table(name = "CARTRIDGES", database = TangoDB.class)
+    public class Cartridge extends Entity 
+    {
+    
+            @Column(name = "SERIAL_NUMBER")
+            private String serialNumber;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "CARTRIDGE_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private CartridgeType cartridgeType;
+
+    
+
+     
+         /**
+         * Gets the SerialNumber.
+         *
+         * return the SerialNumber
+         */
+         public String getSerialNumber()
+         {
+            return serialNumber;
+         }
+
+         /**
+         * Sets the SerialNumber.
+         *
+         * @param serialNumber the SerialNumber
+         */
+         public void setSerialNumber(String serialNumber)
+         {
+            this.serialNumber = serialNumber;
+         }
+     
+     
+         /**
+         * Gets the CartridgeType.
+         *
+         * return the CartridgeType
+         */
+         public CartridgeType getCartridgeType()
+         {
+            return cartridgeType;
+         }
+
+         /**
+         * Sets the CartridgeType.
+         *
+         * @param cartridgeType the CartridgeType
+         */
+         public void setCartridgeType(CartridgeType cartridgeType)
+         {
+            this.cartridgeType = cartridgeType;
+         }
+     
+    }
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
new file mode 100644
index 000000000..1153665ea
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/CartridgeType.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+    }
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
new file mode 100644
index 000000000..13aeec266
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Configuration.java
@@ -0,0 +1,250 @@
+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;
+
+
+    @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_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
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the CreationDate.
+         *
+         * return the CreationDate
+         */
+         public DateTime getCreationDate()
+         {
+            return creationDate;
+         }
+
+         /**
+         * Sets the CreationDate.
+         *
+         * @param creationDate the CreationDate
+         */
+         public void setCreationDate(DateTime creationDate)
+         {
+            this.creationDate = creationDate;
+         }
+     
+     
+         /**
+         * Gets the ApplicationDisplayPanelVersion.
+         *
+         * return the ApplicationDisplayPanelVersion
+         */
+         public ApplicationDisplayPanelVersion getApplicationDisplayPanelVersion()
+         {
+            return applicationDisplayPanelVersion;
+         }
+
+         /**
+         * Sets the ApplicationDisplayPanelVersion.
+         *
+         * @param applicationDisplayPanelVersion the ApplicationDisplayPanelVersion
+         */
+         public void setApplicationDisplayPanelVersion(ApplicationDisplayPanelVersion applicationDisplayPanelVersion)
+         {
+            this.applicationDisplayPanelVersion = applicationDisplayPanelVersion;
+         }
+     
+     
+         /**
+         * Gets the ApplicationFirmwareVersion.
+         *
+         * return the ApplicationFirmwareVersion
+         */
+         public ApplicationFirmwareVersion getApplicationFirmwareVersion()
+         {
+            return applicationFirmwareVersion;
+         }
+
+         /**
+         * Sets the ApplicationFirmwareVersion.
+         *
+         * @param applicationFirmwareVersion the ApplicationFirmwareVersion
+         */
+         public void setApplicationFirmwareVersion(ApplicationFirmwareVersion applicationFirmwareVersion)
+         {
+            this.applicationFirmwareVersion = applicationFirmwareVersion;
+         }
+     
+     
+         /**
+         * Gets the ApplicationOsVersion.
+         *
+         * return the ApplicationOsVersion
+         */
+         public ApplicationOsVersion getApplicationOsVersion()
+         {
+            return applicationOsVersion;
+         }
+
+         /**
+         * Sets the ApplicationOsVersion.
+         *
+         * @param applicationOsVersion the ApplicationOsVersion
+         */
+         public void setApplicationOsVersion(ApplicationOsVersion applicationOsVersion)
+         {
+            this.applicationOsVersion = applicationOsVersion;
+         }
+     
+     
+         /**
+         * Gets the ApplicationVersion.
+         *
+         * return the ApplicationVersion
+         */
+         public ApplicationVersion getApplicationVersion()
+         {
+            return applicationVersion;
+         }
+
+         /**
+         * Sets the ApplicationVersion.
+         *
+         * @param applicationVersion the ApplicationVersion
+         */
+         public void setApplicationVersion(ApplicationVersion applicationVersion)
+         {
+            this.applicationVersion = applicationVersion;
+         }
+     
+     
+         /**
+         * Gets the EmbeddedFirmwareVersion.
+         *
+         * return the EmbeddedFirmwareVersion
+         */
+         public EmbeddedFirmwareVersion getEmbeddedFirmwareVersion()
+         {
+            return embeddedFirmwareVersion;
+         }
+
+         /**
+         * Sets the EmbeddedFirmwareVersion.
+         *
+         * @param embeddedFirmwareVersion the EmbeddedFirmwareVersion
+         */
+         public void setEmbeddedFirmwareVersion(EmbeddedFirmwareVersion embeddedFirmwareVersion)
+         {
+            this.embeddedFirmwareVersion = embeddedFirmwareVersion;
+         }
+     
+     
+         /**
+         * Gets the EmbeddedSoftwareVersion.
+         *
+         * return the EmbeddedSoftwareVersion
+         */
+         public EmbeddedSoftwareVersion getEmbeddedSoftwareVersion()
+         {
+            return embeddedSoftwareVersion;
+         }
+
+         /**
+         * Sets the EmbeddedSoftwareVersion.
+         *
+         * @param embeddedSoftwareVersion the EmbeddedSoftwareVersion
+         */
+         public void setEmbeddedSoftwareVersion(EmbeddedSoftwareVersion embeddedSoftwareVersion)
+         {
+            this.embeddedSoftwareVersion = embeddedSoftwareVersion;
+         }
+     
+     
+         /**
+         * Gets the HardwareVersion.
+         *
+         * return the HardwareVersion
+         */
+         public HardwareVersion getHardwareVersion()
+         {
+            return hardwareVersion;
+         }
+
+         /**
+         * Sets the HardwareVersion.
+         *
+         * @param hardwareVersion the HardwareVersion
+         */
+         public void setHardwareVersion(HardwareVersion hardwareVersion)
+         {
+            this.hardwareVersion = 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 a8a1bddac..d4bc21b34 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,151 +1,172 @@
 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;
 
 
-/**
- * Represents the DAL Contact entity.
- */
-@Table(name = "CONTACTS", database = TangoDB.class)
-public class Contact extends Entity
-{
-    @Column(name = "FIRST_NAME")
-    private String first_name;
-    
-    @Column(name = "LAST_NAME")
-    private String last_name;
-    
-    @Column(name = "FULL_NAME")
-    private String full_name;
-    
-    @Column(name = "EMAIL")
-    private String email;
-    
-    @Column(name = "PHONE_NUMBER")
-    private String phone_number;
-    
-    @Column(name = "FAX")
-    private String fax;
-    
-    /**
-     * Gets first name.
-     *
-     * @return the first name
-     */
-    public String getFirst_name()
+    @Table(name = "CONTACTS", database = TangoDB.class)
+    public class Contact extends Entity 
     {
-        return first_name;
-    }
     
-    /**
-     * Sets first name.
-     *
-     * @param first_name the first name
-     */
-    public void setFirst_name(String first_name)
-    {
-        this.first_name = first_name;
-    }
+            @Column(name = "FIRST_NAME")
+            private String firstName;
+
     
-    /**
-     * Gets last name.
-     *
-     * @return the last name
-     */
-    public String getLast_name()
-    {
-        return last_name;
-    }
     
-    /**
-     * Sets last name.
-     *
-     * @param last_name the last name
-     */
-    public void setLast_name(String last_name)
-    {
-        this.last_name = last_name;
-    }
+            @Column(name = "LAST_NAME")
+            private String lastName;
+
     
-    /**
-     * Gets full name.
-     *
-     * @return the full name
-     */
-    public String getFull_name()
-    {
-        return full_name;
-    }
     
-    /**
-     * Sets full name.
-     *
-     * @param full_name the full name
-     */
-    public void setFull_name(String full_name)
-    {
-        this.full_name = full_name;
-    }
+            @Column(name = "FULL_NAME")
+            private String fullName;
+
     
-    /**
-     * Gets email.
-     *
-     * @return the email
-     */
-    public String getEmail()
-    {
-        return email;
-    }
     
-    /**
-     * Sets email.
-     *
-     * @param email the email
-     */
-    public void setEmail(String email)
-    {
-        this.email = email;
-    }
+            @Column(name = "EMAIL")
+            private String email;
+
     
-    /**
-     * Gets phone number.
-     *
-     * @return the phone number
-     */
-    public String getPhone_number()
-    {
-        return phone_number;
-    }
     
-    /**
-     * Sets phone number.
-     *
-     * @param phone_number the phone number
-     */
-    public void setPhone_number(String phone_number)
-    {
-        this.phone_number = phone_number;
-    }
+            @Column(name = "PHONE_NUMBER")
+            private String phoneNumber;
+
     
-    /**
-     * Gets fax.
-     *
-     * @return the fax
-     */
-    public String getFax()
-    {
-        return fax;
-    }
     
-    /**
-     * Sets fax.
-     *
-     * @param fax the fax
-     */
-    public void setFax(String fax)
-    {
-        this.fax = fax;
+            @Column(name = "FAX")
+            private String fax;
+
+    
+
+     
+         /**
+         * Gets the FirstName.
+         *
+         * return the FirstName
+         */
+         public String getFirstName()
+         {
+            return firstName;
+         }
+
+         /**
+         * Sets the FirstName.
+         *
+         * @param firstName the FirstName
+         */
+         public void setFirstName(String firstName)
+         {
+            this.firstName = firstName;
+         }
+     
+     
+         /**
+         * Gets the LastName.
+         *
+         * return the LastName
+         */
+         public String getLastName()
+         {
+            return lastName;
+         }
+
+         /**
+         * Sets the LastName.
+         *
+         * @param lastName the LastName
+         */
+         public void setLastName(String lastName)
+         {
+            this.lastName = lastName;
+         }
+     
+     
+         /**
+         * Gets the FullName.
+         *
+         * return the FullName
+         */
+         public String getFullName()
+         {
+            return fullName;
+         }
+
+         /**
+         * Sets the FullName.
+         *
+         * @param fullName the FullName
+         */
+         public void setFullName(String fullName)
+         {
+            this.fullName = fullName;
+         }
+     
+     
+         /**
+         * Gets the Email.
+         *
+         * return the Email
+         */
+         public String getEmail()
+         {
+            return email;
+         }
+
+         /**
+         * Sets the Email.
+         *
+         * @param email the Email
+         */
+         public void setEmail(String email)
+         {
+            this.email = email;
+         }
+     
+     
+         /**
+         * Gets the PhoneNumber.
+         *
+         * return the PhoneNumber
+         */
+         public String getPhoneNumber()
+         {
+            return phoneNumber;
+         }
+
+         /**
+         * Sets the PhoneNumber.
+         *
+         * @param phoneNumber the PhoneNumber
+         */
+         public void setPhoneNumber(String phoneNumber)
+         {
+            this.phoneNumber = phoneNumber;
+         }
+     
+     
+         /**
+         * Gets the Fax.
+         *
+         * return the Fax
+         */
+         public String getFax()
+         {
+            return fax;
+         }
+
+         /**
+         * Sets the Fax.
+         *
+         * @param fax the Fax
+         */
+         public void setFax(String fax)
+         {
+            this.fax = fax;
+         }
+     
     }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DateConverter.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DateConverter.java
deleted file mode 100644
index 71d5d5301..000000000
--- a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DateConverter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.twine.tango.dal.entities;
-import com.raizlabs.android.dbflow.converter.TypeConverter;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-
-/**
- * Represents a DBFlow string to date converter used to parse and store SQLite dates.
- */
-@com.raizlabs.android.dbflow.annotation.TypeConverter
-public class DateConverter extends TypeConverter<String,Date>
-{
-    
-    @Override
-    public String getDBValue(Date model)
-    {
-        return android.text.format.DateFormat.format("yyyy-MM-dd hh:mm:ss", model).toString();
-    }
-    
-    @Override
-    public Date getModelValue(String data)
-    {
-        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-        Date date = null;
-        try
-        {
-            date = format.parse(data);
-        } catch (ParseException e)
-        {
-            e.printStackTrace();
-        }
-        return date;
-    }
-}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Dispenser.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Dispenser.java
new file mode 100644
index 000000000..a00ae780e
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Dispenser.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @Table(name = "DISPENSERS", database = TangoDB.class)
+    public class Dispenser extends Entity 
+    {
+    
+            @Column(name = "SERIAL_NUMBER")
+            private String serialNumber;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "DISPENSER_TYPE_GUID", foreignKeyColumnName = "GUID")})
+            private DispenserType dispenserType;
+
+    
+
+     
+         /**
+         * Gets the SerialNumber.
+         *
+         * return the SerialNumber
+         */
+         public String getSerialNumber()
+         {
+            return serialNumber;
+         }
+
+         /**
+         * Sets the SerialNumber.
+         *
+         * @param serialNumber the SerialNumber
+         */
+         public void setSerialNumber(String serialNumber)
+         {
+            this.serialNumber = serialNumber;
+         }
+     
+     
+         /**
+         * Gets the DispenserType.
+         *
+         * return the DispenserType
+         */
+         public DispenserType getDispenserType()
+         {
+            return dispenserType;
+         }
+
+         /**
+         * Sets the DispenserType.
+         *
+         * @param dispenserType the DispenserType
+         */
+         public void setDispenserType(DispenserType dispenserType)
+         {
+            this.dispenserType = dispenserType;
+         }
+     
+    }
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
new file mode 100644
index 000000000..321ba241b
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/DispenserType.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @Table(name = "DISPENSER_TYPES", database = TangoDB.class)
+    public class DispenserType extends Entity 
+    {
+    
+            @Column(name = "CODE")
+            private int code;
+
+    
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+    }
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
new file mode 100644
index 000000000..9e8a1fe78
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedFirmwareVersion.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public Double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(Double version)
+         {
+            this.version = version;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = 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
new file mode 100644
index 000000000..1c4d67a2c
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EmbeddedSoftwareVersion.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public Double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(Double version)
+         {
+            this.version = version;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Event.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Event.java
new file mode 100644
index 000000000..e6c5b562b
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Event.java
@@ -0,0 +1,94 @@
+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;
+
+
+    @Table(name = "EVENTS", database = TangoDB.class)
+    public class Event 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
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventsAction.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventsAction.java
new file mode 100644
index 000000000..6019137ce
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/EventsAction.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @Table(name = "EVENTS_ACTIONS", database = TangoDB.class)
+    public class EventsAction extends Entity 
+    {
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "ACTION_GUID", foreignKeyColumnName = "GUID")})
+            private Action action;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_GUID", foreignKeyColumnName = "GUID")})
+            private Event event;
+
+    
+
+     
+         /**
+         * Gets the Action.
+         *
+         * return the Action
+         */
+         public Action getAction()
+         {
+            return action;
+         }
+
+         /**
+         * Sets the Action.
+         *
+         * @param action the Action
+         */
+         public void setAction(Action action)
+         {
+            this.action = action;
+         }
+     
+     
+         /**
+         * Gets the Event.
+         *
+         * return the Event
+         */
+         public Event getEvent()
+         {
+            return event;
+         }
+
+         /**
+         * Sets the Event.
+         *
+         * @param event the Event
+         */
+         public void setEvent(Event event)
+         {
+            this.event = event;
+         }
+     
+    }
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
new file mode 100644
index 000000000..3005518f6
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberShape.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = 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
new file mode 100644
index 000000000..b1fe190c2
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/FiberSynth.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+         }
+     
+    }
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
new file mode 100644
index 000000000..a6599f20e
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/HardwareVersion.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public Double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(Double version)
+         {
+            this.version = version;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+    }
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
new file mode 100644
index 000000000..0bdabfc83
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/IdsPack.java
@@ -0,0 +1,146 @@
+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;
+
+
+    @Table(name = "IDS_PACKS", database = TangoDB.class)
+    public class IdsPack extends Entity 
+    {
+    
+            @Column(name = "NAME")
+            private String name;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "CARTRIDGE_GUID", foreignKeyColumnName = "GUID")})
+            private Cartridge cartridge;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONFIGURATION_GUID", foreignKeyColumnName = "GUID")})
+            private Configuration configuration;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "DISPENSER_GUID", foreignKeyColumnName = "GUID")})
+            private Dispenser dispenser;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_GUID", foreignKeyColumnName = "GUID")})
+            private Liquid liquid;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Cartridge.
+         *
+         * return the Cartridge
+         */
+         public Cartridge getCartridge()
+         {
+            return cartridge;
+         }
+
+         /**
+         * Sets the Cartridge.
+         *
+         * @param cartridge the Cartridge
+         */
+         public void setCartridge(Cartridge cartridge)
+         {
+            this.cartridge = cartridge;
+         }
+     
+     
+         /**
+         * Gets the Configuration.
+         *
+         * return the Configuration
+         */
+         public Configuration getConfiguration()
+         {
+            return configuration;
+         }
+
+         /**
+         * Sets the Configuration.
+         *
+         * @param configuration the Configuration
+         */
+         public void setConfiguration(Configuration configuration)
+         {
+            this.configuration = configuration;
+         }
+     
+     
+         /**
+         * Gets the Dispenser.
+         *
+         * return the Dispenser
+         */
+         public Dispenser getDispenser()
+         {
+            return dispenser;
+         }
+
+         /**
+         * Sets the Dispenser.
+         *
+         * @param dispenser the Dispenser
+         */
+         public void setDispenser(Dispenser dispenser)
+         {
+            this.dispenser = dispenser;
+         }
+     
+     
+         /**
+         * Gets the Liquid.
+         *
+         * return the Liquid
+         */
+         public Liquid getLiquid()
+         {
+            return liquid;
+         }
+
+         /**
+         * Sets the Liquid.
+         *
+         * @param liquid the Liquid
+         */
+         public void setLiquid(Liquid liquid)
+         {
+            this.liquid = liquid;
+         }
+     
+    }
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
new file mode 100644
index 000000000..a88127dd6
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LinearMassDensityUnit.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Liquid.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Liquid.java
new file mode 100644
index 000000000..6d43161f7
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Liquid.java
@@ -0,0 +1,120 @@
+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;
+
+
+    @Table(name = "LIQUIDS", database = TangoDB.class)
+    public class Liquid 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
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Version.
+         *
+         * return the Version
+         */
+         public Double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(Double version)
+         {
+            this.version = version;
+         }
+     
+     
+         /**
+         * Gets the Color.
+         *
+         * return the Color
+         */
+         public int getColor()
+         {
+            return color;
+         }
+
+         /**
+         * Sets the Color.
+         *
+         * @param color the Color
+         */
+         public void setColor(int color)
+         {
+            this.color = color;
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidsRml.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidsRml.java
new file mode 100644
index 000000000..ea79f4741
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/LiquidsRml.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @Table(name = "LIQUIDS_RMLS", database = TangoDB.class)
+    public class LiquidsRml extends Entity 
+    {
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "LIQUID_GUID", foreignKeyColumnName = "GUID")})
+            private Liquid liquid;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "RML_GUID", foreignKeyColumnName = "GUID")})
+            private Rml rml;
+
+    
+
+     
+         /**
+         * Gets the Liquid.
+         *
+         * return the Liquid
+         */
+         public Liquid getLiquid()
+         {
+            return liquid;
+         }
+
+         /**
+         * Sets the Liquid.
+         *
+         * @param liquid the Liquid
+         */
+         public void setLiquid(Liquid liquid)
+         {
+            this.liquid = liquid;
+         }
+     
+     
+         /**
+         * Gets the Rml.
+         *
+         * return the Rml
+         */
+         public Rml getRml()
+         {
+            return rml;
+         }
+
+         /**
+         * Sets the Rml.
+         *
+         * @param rml the Rml
+         */
+         public void setRml(Rml rml)
+         {
+            this.rml = 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
new file mode 100644
index 000000000..d91a1d4cf
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Machine.java
@@ -0,0 +1,146 @@
+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;
+
+
+    @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;
+
+    
+    
+            @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
+         */
+         public String getSerialNumber()
+         {
+            return serialNumber;
+         }
+
+         /**
+         * Sets the SerialNumber.
+         *
+         * @param serialNumber the SerialNumber
+         */
+         public void setSerialNumber(String serialNumber)
+         {
+            this.serialNumber = serialNumber;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the ProductionDate.
+         *
+         * return the ProductionDate
+         */
+         public DateTime getProductionDate()
+         {
+            return productionDate;
+         }
+
+         /**
+         * Sets the ProductionDate.
+         *
+         * @param productionDate the ProductionDate
+         */
+         public void setProductionDate(DateTime productionDate)
+         {
+            this.productionDate = productionDate;
+         }
+     
+     
+         /**
+         * Gets the MachineVersion.
+         *
+         * return the MachineVersion
+         */
+         public MachineVersion getMachineVersion()
+         {
+            return machineVersion;
+         }
+
+         /**
+         * Sets the MachineVersion.
+         *
+         * @param machineVersion the MachineVersion
+         */
+         public void setMachineVersion(MachineVersion machineVersion)
+         {
+            this.machineVersion = machineVersion;
+         }
+     
+     
+         /**
+         * Gets the Organization.
+         *
+         * return the Organization
+         */
+         public Organization getOrganization()
+         {
+            return organization;
+         }
+
+         /**
+         * Sets the Organization.
+         *
+         * @param organization the Organization
+         */
+         public void setOrganization(Organization organization)
+         {
+            this.organization = organization;
+         }
+     
+    }
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
new file mode 100644
index 000000000..832428f73
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachineVersion.java
@@ -0,0 +1,94 @@
+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;
+
+
+    @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
+         */
+         public Double getVersion()
+         {
+            return version;
+         }
+
+         /**
+         * Sets the Version.
+         *
+         * @param version the Version
+         */
+         public void setVersion(Double version)
+         {
+            this.version = version;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Configuration.
+         *
+         * return the Configuration
+         */
+         public Configuration getConfiguration()
+         {
+            return configuration;
+         }
+
+         /**
+         * Sets the Configuration.
+         *
+         * @param configuration the Configuration
+         */
+         public void setConfiguration(Configuration configuration)
+         {
+            this.configuration = 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
new file mode 100644
index 000000000..1325eb93a
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesConfiguration.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public Configuration getConfiguration()
+         {
+            return configuration;
+         }
+
+         /**
+         * Sets the Configuration.
+         *
+         * @param configuration the Configuration
+         */
+         public void setConfiguration(Configuration configuration)
+         {
+            this.configuration = configuration;
+         }
+     
+     
+         /**
+         * Gets the Machine.
+         *
+         * return the Machine
+         */
+         public Machine getMachine()
+         {
+            return machine;
+         }
+
+         /**
+         * Sets the Machine.
+         *
+         * @param machine the Machine
+         */
+         public void setMachine(Machine machine)
+         {
+            this.machine = 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
new file mode 100644
index 000000000..15b55c35c
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MachinesEvent.java
@@ -0,0 +1,146 @@
+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;
+
+
+    @Table(name = "MACHINES_EVENTS", database = TangoDB.class)
+    public class MachinesEvent extends Entity 
+    {
+    
+            @Column(name = "DATE_TIME")
+            private DateTime dateTime;
+
+    
+    
+            @Column(name = "DESCRIPTION")
+            private String description;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "EVENT_GUID", foreignKeyColumnName = "GUID")})
+            private Event event;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "MACHINE_GUID", foreignKeyColumnName = "GUID")})
+            private Machine machine;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
+            private User user;
+
+    
+
+     
+         /**
+         * Gets the DateTime.
+         *
+         * return the DateTime
+         */
+         public DateTime getDateTime()
+         {
+            return dateTime;
+         }
+
+         /**
+         * Sets the DateTime.
+         *
+         * @param dateTime the DateTime
+         */
+         public void setDateTime(DateTime dateTime)
+         {
+            this.dateTime = dateTime;
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+         }
+     
+     
+         /**
+         * Gets the Event.
+         *
+         * return the Event
+         */
+         public Event getEvent()
+         {
+            return event;
+         }
+
+         /**
+         * Sets the Event.
+         *
+         * @param event the Event
+         */
+         public void setEvent(Event event)
+         {
+            this.event = event;
+         }
+     
+     
+         /**
+         * Gets the Machine.
+         *
+         * return the Machine
+         */
+         public Machine getMachine()
+         {
+            return machine;
+         }
+
+         /**
+         * Sets the Machine.
+         *
+         * @param machine the Machine
+         */
+         public void setMachine(Machine machine)
+         {
+            this.machine = machine;
+         }
+     
+     
+         /**
+         * Gets the User.
+         *
+         * return the User
+         */
+         public User getUser()
+         {
+            return user;
+         }
+
+         /**
+         * Sets the User.
+         *
+         * @param user the User
+         */
+         public void setUser(User user)
+         {
+            this.user = 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
new file mode 100644
index 000000000..1410a87e5
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaColor.java
@@ -0,0 +1,42 @@
+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;
+
+
+    @Table(name = "MEDIA_COLORS", database = TangoDB.class)
+    public class MediaColor extends Entity 
+    {
+    
+            @Column(name = "COLOR")
+            private int color;
+
+    
+
+     
+         /**
+         * Gets the Color.
+         *
+         * return the Color
+         */
+         public int getColor()
+         {
+            return color;
+         }
+
+         /**
+         * Sets the Color.
+         *
+         * @param color the Color
+         */
+         public void setColor(int color)
+         {
+            this.color = color;
+         }
+     
+    }
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
new file mode 100644
index 000000000..405eb81b4
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaCondition.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = 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
new file mode 100644
index 000000000..2b3e4a333
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaMaterial.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = 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
new file mode 100644
index 000000000..e2e8f81b7
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/MediaPurpose.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Code.
+         *
+         * return the Code
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+         }
+     
+    }
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 870b80ad3..4cc0e0955 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
@@ -4,81 +4,91 @@ 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;
 
 
-/**
- * Represents the DAL Organization entity.
- */
-@Table(name = "ORGANIZATIONS", database = TangoDB.class)
-public class Organization extends Entity
-{
-    @Column(name = "NAME")
-    private String name;
-
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "CONTACT_GUID", foreignKeyColumnName = "GUID")})
-    private Contact contact;
-    
-    @ForeignKey(references = {@ForeignKeyReference(columnName = "ADDRESS_GUID", foreignKeyColumnName = "GUID")})
-    private Address address;
-    
-    /**
-     * Gets name.
-     *
-     * @return the name
-     */
-    public String getName()
+    @Table(name = "ORGANIZATIONS", database = TangoDB.class)
+    public class Organization extends Entity 
     {
-        return name;
-    }
     
-    /**
-     * Sets name.
-     *
-     * @param name the name
-     */
-    public void setName(String name)
-    {
-        this.name = name;
-    }
+            @Column(name = "NAME")
+            private String name;
+
     
-    /**
-     * Gets contact.
-     *
-     * @return the contact
-     */
-    public Contact getContact()
-    {
-        return contact;
-    }
     
-    /**
-     * Sets contact.
-     *
-     * @param contact the contact
-     */
-    public void setContact(Contact contact)
-    {
-        this.contact = contact;
-    }
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "ADDRESS_GUID", foreignKeyColumnName = "GUID")})
+            private Address address;
+
     
-    /**
-     * Gets address.
-     *
-     * @return the address
-     */
-    public Address getAddress()
-    {
-        return address;
-    }
     
-    /**
-     * Sets address.
-     *
-     * @param address the address
-     */
-    public void setAddress(Address address)
-    {
-        this.address = address;
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "CONTACT_GUID", foreignKeyColumnName = "GUID")})
+            private Contact contact;
+
+    
+
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Address.
+         *
+         * return the Address
+         */
+         public Address getAddress()
+         {
+            return address;
+         }
+
+         /**
+         * Sets the Address.
+         *
+         * @param address the Address
+         */
+         public void setAddress(Address address)
+         {
+            this.address = address;
+         }
+     
+     
+         /**
+         * Gets the Contact.
+         *
+         * return the Contact
+         */
+         public Contact getContact()
+         {
+            return contact;
+         }
+
+         /**
+         * Sets the Contact.
+         *
+         * @param contact the Contact
+         */
+         public void setContact(Contact contact)
+         {
+            this.contact = 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
new file mode 100644
index 000000000..993ca374e
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Permission.java
@@ -0,0 +1,94 @@
+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;
+
+
+    @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
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = description;
+         }
+     
+    }
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
new file mode 100644
index 000000000..5f7fe528d
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Rml.java
@@ -0,0 +1,484 @@
+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;
+
+
+    @Table(name = "RMLS", database = TangoDB.class)
+    public class Rml extends Entity 
+    {
+    
+            @Column(name = "MANUFACTURER")
+            private String manufacturer;
+
+    
+    
+            @Column(name = "FIBER_SIZE")
+            private Double fiberSize;
+
+    
+    
+            @Column(name = "NUMBER_OF_FIBER")
+            private int numberOfFiber;
+
+    
+    
+            @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 Manufacturer.
+         *
+         * return the Manufacturer
+         */
+         public String getManufacturer()
+         {
+            return manufacturer;
+         }
+
+         /**
+         * Sets the Manufacturer.
+         *
+         * @param manufacturer the Manufacturer
+         */
+         public void setManufacturer(String manufacturer)
+         {
+            this.manufacturer = manufacturer;
+         }
+     
+     
+         /**
+         * Gets the FiberSize.
+         *
+         * return the FiberSize
+         */
+         public Double getFiberSize()
+         {
+            return fiberSize;
+         }
+
+         /**
+         * Sets the FiberSize.
+         *
+         * @param fiberSize the FiberSize
+         */
+         public void setFiberSize(Double fiberSize)
+         {
+            this.fiberSize = fiberSize;
+         }
+     
+     
+         /**
+         * Gets the NumberOfFiber.
+         *
+         * return the NumberOfFiber
+         */
+         public int getNumberOfFiber()
+         {
+            return numberOfFiber;
+         }
+
+         /**
+         * Sets the NumberOfFiber.
+         *
+         * @param numberOfFiber the NumberOfFiber
+         */
+         public void setNumberOfFiber(int numberOfFiber)
+         {
+            this.numberOfFiber = numberOfFiber;
+         }
+     
+     
+         /**
+         * Gets the PliesPerFiber.
+         *
+         * return the PliesPerFiber
+         */
+         public int getPliesPerFiber()
+         {
+            return pliesPerFiber;
+         }
+
+         /**
+         * Sets the PliesPerFiber.
+         *
+         * @param pliesPerFiber the PliesPerFiber
+         */
+         public void setPliesPerFiber(int pliesPerFiber)
+         {
+            this.pliesPerFiber = pliesPerFiber;
+         }
+     
+     
+         /**
+         * Gets the PliesPerThread.
+         *
+         * return the PliesPerThread
+         */
+         public int getPliesPerThread()
+         {
+            return pliesPerThread;
+         }
+
+         /**
+         * Sets the PliesPerThread.
+         *
+         * @param pliesPerThread the PliesPerThread
+         */
+         public void setPliesPerThread(int pliesPerThread)
+         {
+            this.pliesPerThread = pliesPerThread;
+         }
+     
+     
+         /**
+         * Gets the Twisted.
+         *
+         * return the Twisted
+         */
+         public Boolean isTwisted()
+         {
+            return twisted;
+         }
+
+         /**
+         * Sets the Twisted.
+         *
+         * @param twisted the Twisted
+         */
+         public void setTwisted(Boolean twisted)
+         {
+            this.twisted = twisted;
+         }
+     
+     
+         /**
+         * Gets the AirEntanglement.
+         *
+         * return the AirEntanglement
+         */
+         public Boolean isAirEntanglement()
+         {
+            return airEntanglement;
+         }
+
+         /**
+         * Sets the AirEntanglement.
+         *
+         * @param airEntanglement the AirEntanglement
+         */
+         public void setAirEntanglement(Boolean airEntanglement)
+         {
+            this.airEntanglement = airEntanglement;
+         }
+     
+     
+         /**
+         * Gets the Lubricant.
+         *
+         * return the Lubricant
+         */
+         public Boolean isLubricant()
+         {
+            return lubricant;
+         }
+
+         /**
+         * Sets the Lubricant.
+         *
+         * @param lubricant the Lubricant
+         */
+         public void setLubricant(Boolean lubricant)
+         {
+            this.lubricant = lubricant;
+         }
+     
+     
+         /**
+         * Gets the TensileStrength.
+         *
+         * return the TensileStrength
+         */
+         public Double getTensileStrength()
+         {
+            return tensileStrength;
+         }
+
+         /**
+         * Sets the TensileStrength.
+         *
+         * @param tensileStrength the TensileStrength
+         */
+         public void setTensileStrength(Double tensileStrength)
+         {
+            this.tensileStrength = tensileStrength;
+         }
+     
+     
+         /**
+         * Gets the ElongationAtBreakPercentage.
+         *
+         * return the ElongationAtBreakPercentage
+         */
+         public Double getElongationAtBreakPercentage()
+         {
+            return elongationAtBreakPercentage;
+         }
+
+         /**
+         * Sets the ElongationAtBreakPercentage.
+         *
+         * @param elongationAtBreakPercentage the ElongationAtBreakPercentage
+         */
+         public void setElongationAtBreakPercentage(Double elongationAtBreakPercentage)
+         {
+            this.elongationAtBreakPercentage = elongationAtBreakPercentage;
+         }
+     
+     
+         /**
+         * Gets the EstimatedThreadDiameter.
+         *
+         * return the EstimatedThreadDiameter
+         */
+         public Double getEstimatedThreadDiameter()
+         {
+            return estimatedThreadDiameter;
+         }
+
+         /**
+         * Sets the EstimatedThreadDiameter.
+         *
+         * @param estimatedThreadDiameter the EstimatedThreadDiameter
+         */
+         public void setEstimatedThreadDiameter(Double estimatedThreadDiameter)
+         {
+            this.estimatedThreadDiameter = estimatedThreadDiameter;
+         }
+     
+     
+         /**
+         * Gets the FiberShape.
+         *
+         * return the FiberShape
+         */
+         public FiberShape getFiberShape()
+         {
+            return fiberShape;
+         }
+
+         /**
+         * Sets the FiberShape.
+         *
+         * @param fiberShape the FiberShape
+         */
+         public void setFiberShape(FiberShape fiberShape)
+         {
+            this.fiberShape = fiberShape;
+         }
+     
+     
+         /**
+         * Gets the FiberSynth.
+         *
+         * return the FiberSynth
+         */
+         public FiberSynth getFiberSynth()
+         {
+            return fiberSynth;
+         }
+
+         /**
+         * Sets the FiberSynth.
+         *
+         * @param fiberSynth the FiberSynth
+         */
+         public void setFiberSynth(FiberSynth fiberSynth)
+         {
+            this.fiberSynth = fiberSynth;
+         }
+     
+     
+         /**
+         * Gets the LinearMassDensityUnit.
+         *
+         * return the LinearMassDensityUnit
+         */
+         public LinearMassDensityUnit getLinearMassDensityUnit()
+         {
+            return linearMassDensityUnit;
+         }
+
+         /**
+         * Sets the LinearMassDensityUnit.
+         *
+         * @param linearMassDensityUnit the LinearMassDensityUnit
+         */
+         public void setLinearMassDensityUnit(LinearMassDensityUnit linearMassDensityUnit)
+         {
+            this.linearMassDensityUnit = linearMassDensityUnit;
+         }
+     
+     
+         /**
+         * Gets the MediaColor.
+         *
+         * return the MediaColor
+         */
+         public MediaColor getMediaColor()
+         {
+            return mediaColor;
+         }
+
+         /**
+         * Sets the MediaColor.
+         *
+         * @param mediaColor the MediaColor
+         */
+         public void setMediaColor(MediaColor mediaColor)
+         {
+            this.mediaColor = mediaColor;
+         }
+     
+     
+         /**
+         * Gets the MediaCondition.
+         *
+         * return the MediaCondition
+         */
+         public MediaCondition getMediaCondition()
+         {
+            return mediaCondition;
+         }
+
+         /**
+         * Sets the MediaCondition.
+         *
+         * @param mediaCondition the MediaCondition
+         */
+         public void setMediaCondition(MediaCondition mediaCondition)
+         {
+            this.mediaCondition = mediaCondition;
+         }
+     
+     
+         /**
+         * Gets the MediaMaterial.
+         *
+         * return the MediaMaterial
+         */
+         public MediaMaterial getMediaMaterial()
+         {
+            return mediaMaterial;
+         }
+
+         /**
+         * Sets the MediaMaterial.
+         *
+         * @param mediaMaterial the MediaMaterial
+         */
+         public void setMediaMaterial(MediaMaterial mediaMaterial)
+         {
+            this.mediaMaterial = mediaMaterial;
+         }
+     
+     
+         /**
+         * Gets the MediaPurpose.
+         *
+         * return the MediaPurpose
+         */
+         public MediaPurpose getMediaPurpose()
+         {
+            return mediaPurpose;
+         }
+
+         /**
+         * Sets the MediaPurpose.
+         *
+         * @param mediaPurpose the MediaPurpose
+         */
+         public void setMediaPurpose(MediaPurpose mediaPurpose)
+         {
+            this.mediaPurpose = 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
new file mode 100644
index 000000000..67af86526
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/Role.java
@@ -0,0 +1,94 @@
+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;
+
+
+    @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
+         */
+         public int getCode()
+         {
+            return code;
+         }
+
+         /**
+         * Sets the Code.
+         *
+         * @param code the Code
+         */
+         public void setCode(int code)
+         {
+            this.code = code;
+         }
+     
+     
+         /**
+         * Gets the Name.
+         *
+         * return the Name
+         */
+         public String getName()
+         {
+            return name;
+         }
+
+         /**
+         * Sets the Name.
+         *
+         * @param name the Name
+         */
+         public void setName(String name)
+         {
+            this.name = name;
+         }
+     
+     
+         /**
+         * Gets the Description.
+         *
+         * return the Description
+         */
+         public String getDescription()
+         {
+            return description;
+         }
+
+         /**
+         * Sets the Description.
+         *
+         * @param description the Description
+         */
+         public void setDescription(String description)
+         {
+            this.description = 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
new file mode 100644
index 000000000..6fe88c192
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/RolesPermission.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @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
+         */
+         public Permission getPermission()
+         {
+            return permission;
+         }
+
+         /**
+         * Sets the Permission.
+         *
+         * @param permission the Permission
+         */
+         public void setPermission(Permission permission)
+         {
+            this.permission = permission;
+         }
+     
+     
+         /**
+         * Gets the Role.
+         *
+         * return the Role
+         */
+         public Role getRole()
+         {
+            return role;
+         }
+
+         /**
+         * Sets the Role.
+         *
+         * @param role the Role
+         */
+         public void setRole(Role role)
+         {
+            this.role = role;
+         }
+     
+    }
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
new file mode 100644
index 000000000..e4f95db71
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/SyncConfiguration.java
@@ -0,0 +1,16 @@
+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;
+
+
+    @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/User.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java
new file mode 100644
index 000000000..5a346a620
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/User.java
@@ -0,0 +1,146 @@
+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;
+
+
+    @Table(name = "USERS", database = TangoDB.class)
+    public class User extends Entity 
+    {
+    
+            @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 Email.
+         *
+         * return the Email
+         */
+         public String getEmail()
+         {
+            return email;
+         }
+
+         /**
+         * Sets the Email.
+         *
+         * @param email the Email
+         */
+         public void setEmail(String email)
+         {
+            this.email = email;
+         }
+     
+     
+         /**
+         * Gets the Password.
+         *
+         * return the Password
+         */
+         public String getPassword()
+         {
+            return password;
+         }
+
+         /**
+         * Sets the Password.
+         *
+         * @param password the Password
+         */
+         public void setPassword(String password)
+         {
+            this.password = password;
+         }
+     
+     
+         /**
+         * Gets the Address.
+         *
+         * return the Address
+         */
+         public Address getAddress()
+         {
+            return address;
+         }
+
+         /**
+         * Sets the Address.
+         *
+         * @param address the Address
+         */
+         public void setAddress(Address address)
+         {
+            this.address = address;
+         }
+     
+     
+         /**
+         * Gets the Contact.
+         *
+         * return the Contact
+         */
+         public Contact getContact()
+         {
+            return contact;
+         }
+
+         /**
+         * Sets the Contact.
+         *
+         * @param contact the Contact
+         */
+         public void setContact(Contact contact)
+         {
+            this.contact = contact;
+         }
+     
+     
+         /**
+         * Gets the Organization.
+         *
+         * return the Organization
+         */
+         public Organization getOrganization()
+         {
+            return organization;
+         }
+
+         /**
+         * Sets the Organization.
+         *
+         * @param organization the Organization
+         */
+         public void setOrganization(Organization organization)
+         {
+            this.organization = 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
new file mode 100644
index 000000000..ad1c44bd1
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/entities/UsersRole.java
@@ -0,0 +1,68 @@
+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;
+
+
+    @Table(name = "USERS_ROLES", database = TangoDB.class)
+    public class UsersRole extends Entity 
+    {
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "ROLE_GUID", foreignKeyColumnName = "GUID")})
+            private Role role;
+
+    
+    
+            @ForeignKey(references = { @ForeignKeyReference(columnName = "USER_GUID", foreignKeyColumnName = "GUID")})
+            private User user;
+
+    
+
+     
+         /**
+         * Gets the Role.
+         *
+         * return the Role
+         */
+         public Role getRole()
+         {
+            return role;
+         }
+
+         /**
+         * Sets the Role.
+         *
+         * @param role the Role
+         */
+         public void setRole(Role role)
+         {
+            this.role = role;
+         }
+     
+     
+         /**
+         * Gets the User.
+         *
+         * return the User
+         */
+         public User getUser()
+         {
+            return user;
+         }
+
+         /**
+         * Sets the User.
+         *
+         * @param user the User
+         */
+         public void setUser(User user)
+         {
+            this.user = user;
+         }
+     
+    }
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Actions.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Actions.java
new file mode 100644
index 000000000..55eebeb78
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Actions.java
@@ -0,0 +1,15 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum Actions
+{
+    ;
+
+    private int value;
+
+    Actions(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/CartridgeTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/CartridgeTypes.java
new file mode 100644
index 000000000..7be6a56e6
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/CartridgeTypes.java
@@ -0,0 +1,19 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum CartridgeTypes
+{
+
+    @DescriptionAnnotation(description = "Cartridge 1")
+    Cartridge1(1),
+
+    ;
+
+    private int value;
+
+    CartridgeTypes(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/DispenserTypes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/DispenserTypes.java
new file mode 100644
index 000000000..dc6ccf001
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/DispenserTypes.java
@@ -0,0 +1,19 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum DispenserTypes
+{
+
+    @DescriptionAnnotation(description = "Dispenser 1")
+    Dispenser1(1),
+
+    ;
+
+    private int value;
+
+    DispenserTypes(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EnumDemo.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EnumDemo.java
new file mode 100644
index 000000000..a92d6aefa
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/EnumDemo.java
@@ -0,0 +1,20 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum EnumDemo
+{
+    @DescriptionAnnotation(description = "Hi")
+    PENNY(1),
+    NICKLE(5),
+    DIME(10),
+    QUARTER(25);
+    
+    
+    private int value;
+    
+    EnumDemo(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Events.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Events.java
new file mode 100644
index 000000000..bfa2e1758
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Events.java
@@ -0,0 +1,15 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum Events
+{
+    ;
+
+    private int value;
+
+    Events(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java
new file mode 100644
index 000000000..d146cd79a
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberShapes.java
@@ -0,0 +1,15 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum FiberShapes
+{
+    ;
+
+    private int value;
+
+    FiberShapes(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java
new file mode 100644
index 000000000..0b8b6384d
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/FiberSynths.java
@@ -0,0 +1,15 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum FiberSynths
+{
+    ;
+
+    private int value;
+
+    FiberSynths(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java
new file mode 100644
index 000000000..495a187f1
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/LinearMassDensityUnits.java
@@ -0,0 +1,15 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum LinearMassDensityUnits
+{
+    ;
+
+    private int value;
+
+    LinearMassDensityUnits(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Liquids.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Liquids.java
new file mode 100644
index 000000000..ca82d56ad
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Liquids.java
@@ -0,0 +1,22 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum Liquids
+{
+
+    @DescriptionAnnotation(description = "Cyan")
+    Cyan(1),
+
+    @DescriptionAnnotation(description = "Magenta")
+    Magenta(2),
+
+    ;
+
+    private int value;
+
+    Liquids(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java
new file mode 100644
index 000000000..7fc83ad16
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaConditions.java
@@ -0,0 +1,15 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum MediaConditions
+{
+    ;
+
+    private int value;
+
+    MediaConditions(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java
new file mode 100644
index 000000000..ca2b458af
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaMaterials.java
@@ -0,0 +1,15 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum MediaMaterials
+{
+    ;
+
+    private int value;
+
+    MediaMaterials(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java
new file mode 100644
index 000000000..8cf72e8e0
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/MediaPurposes.java
@@ -0,0 +1,15 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum MediaPurposes
+{
+    ;
+
+    private int value;
+
+    MediaPurposes(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java
new file mode 100644
index 000000000..cb3cc1c56
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Permissions.java
@@ -0,0 +1,25 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum Permissions
+{
+
+    @DescriptionAnnotation(description = "Allows loading the technician module in Machine Studio")
+    RunTechnicianModule(0),
+
+    @DescriptionAnnotation(description = "Allows loading the developer module in Machine Studio")
+    RunDeveloperModule(1),
+
+    @DescriptionAnnotation(description = "Allows loading the database module in Machine Studio")
+    RunDataBaseModule(2),
+
+    ;
+
+    private int value;
+
+    Permissions(int value)
+    {
+        this.value = value;
+    }
+}
diff --git a/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Roles.java b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Roles.java
new file mode 100644
index 000000000..8be545370
--- /dev/null
+++ b/Software/Android_Studio/Tango.DAL/src/main/java/com/twine/tango/dal/enumerations/Roles.java
@@ -0,0 +1,31 @@
+package com.twine.tango.dal.enumerations;
+
+import com.twine.tango.core.DescriptionAnnotation;
+
+public enum Roles
+{
+
+    @DescriptionAnnotation(description = "User with standard permissions")
+    User(0),
+
+    @DescriptionAnnotation(description = "Twine administrator")
+    Administrator(1),
+
+    @DescriptionAnnotation(description = "Twine technician")
+    Technician(2),
+
+    @DescriptionAnnotation(description = "Twine Research and development")
+    Developer(3),
+
+    @DescriptionAnnotation(description = "Role Description")
+    SomeRole(4),
+
+    ;
+
+    private int value;
+
+    Roles(int value)
+    {
+        this.value = value;
+    }
+}