Began refactoring of file parsing to accomidate new db, allow for
additional device types