diff --git a/.gitignore b/.gitignore
index 6769e21..958aaf2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -157,4 +157,7 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
\ No newline at end of file
+#.idea/
+
+# RPM spec files
+*.spec
\ No newline at end of file
diff --git a/.idea/VoterWarehouse.iml b/.idea/VoterWarehouse.iml
index 069bbf1..5aaaa74 100644
--- a/.idea/VoterWarehouse.iml
+++ b/.idea/VoterWarehouse.iml
@@ -2,6 +2,8 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/dist" />
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
     <orderEntry type="jdk" jdkName="Python 3.11 (VoterWarehouse)" jdkType="Python SDK" />
diff --git a/.idea/runConfigurations/voterwarehouse.xml b/.idea/runConfigurations/voterwarehouse_NC_history.xml
similarity index 89%
rename from .idea/runConfigurations/voterwarehouse.xml
rename to .idea/runConfigurations/voterwarehouse_NC_history.xml
index a23680b..09bb309 100644
--- a/.idea/runConfigurations/voterwarehouse.xml
+++ b/.idea/runConfigurations/voterwarehouse_NC_history.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="voterwarehouse" type="PythonConfigurationType" factoryName="Python" nameIsGenerated="true">
+  <configuration default="false" name="voterwarehouse NC history" type="PythonConfigurationType" factoryName="Python">
     <module name="VoterWarehouse" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
diff --git a/Import/Florida.py b/Import/Florida.py
index ecfdbc3..835d2e6 100644
--- a/Import/Florida.py
+++ b/Import/Florida.py
@@ -2,11 +2,16 @@
 
 # Handles Raw data import methods for Florida data
 
+import csv
 import datetime
+import io
 import zipfile
 
-import Warehouse.FloridaSQL
+import Warehouse.FloridaSQL as StateSQL
 from Import.State import State
+from Import.FloridaCodes import __history_import_map__
+from Import.FloridaCodes import __voter_import_map__
+from Import.FloridaCodes import __suppress_keys__
 
 
 class Florida(State):
@@ -17,121 +22,42 @@ class Florida(State):
     valid_import_types = {
         "voters": {
             "sql": "set_voter",
-            "parse": "parse_raw_voter_into_tuple",
-            "batch_size": 200000
+            "parse": "parse_voter_into_tuple",
+            "batch_size": 200000,
+            "fields": __voter_import_map__.keys()
         },
         "histories": {
             "sql": "set_history",
-            "parse": "parse_raw_history_into_tuple",
-            "batch_size": 200000
+            "parse": "parse_history_into_tuple",
+            "batch_size": 200000,
+            "fields": __history_import_map__.keys()
         }
     }
 
-    history_keys = [
-        "county_code",
-        "voter_id",
-        "election_date",
-        "election_type",
-        "history_code"
-    ]
-
-    voter_keys = [
-        "county_code",
-        "voter_id",
-        "name_last",
-        "name_suffix",
-        "name_first",
-        "name_middle",
-        "suppress_address",
-        "residence_address_line_1",
-        "residence_address_line_2",
-        "residence_city",
-        "residence_state",
-        "residence_zipcode",
-        "mailing_address_line_1",
-        "mailing_address_line_2",
-        "mailing_address_line_3",
-        "mailing_city",
-        "mailing_state",
-        "mailing_zipcode",
-        "mailing_country",
-        "gender",
-        "race",
-        "birth_date",
-        "registration_date",
-        "party_affiliation",
-        "precinct",
-        "precinct_group",
-        "precinct_split",
-        "precinct_suffix",
-        "voter_status",
-        "congressional_district",
-        "house_district",
-        "senate_district",
-        "county_commission_district",
-        "school_board_district",
-        "daytime_area_code",
-        "daytime_phone_number",
-        "daytime_phone_extension",
-        "email_address"
-    ]
-
-    suppress_keys = [
-        "name_last",
-        "name_suffix",
-        "name_first",
-        "name_middle",
-        "residence_address_line_1",
-        "residence_address_line_2",
-        "residence_city",
-        "residence_state",
-        "residence_zipcode",
-        "mailing_address_line_1",
-        "mailing_address_line_2",
-        "mailing_address_line_3",
-        "mailing_city",
-        "mailing_state",
-        "mailing_zipcode",
-        "mailing_country",
-        "precinct",
-        "precinct_group",
-        "precinct_split",
-        "precinct_suffix",
-        "congressional_district",
-        "house_district",
-        "senate_district",
-        "county_commission_district",
-        "school_board_district",
-        "daytime_area_code",
-        "daytime_phone_number",
-        "daytime_phone_extension",
-        "email_address"
-    ]
-
-    def parse_raw_history_into_tuple(self, history_raw: bytes, export_date: str) -> tuple[str | None, ...]:
+    @staticmethod
+    def parse_history_into_tuple(history: dict, export_date: str) -> tuple[str | None, ...]:
         """
         Build a temporary dictionary from raw voter binary string
 
-        :param bytes history_raw: A byte string containing a raw row of history data
+        :param dict history: A dictionary containing a raw row of history data
         :param str export_date: Export date string in YYYY-MM-DD format
         :return: A tuple of SQL ready prepared parameters
         :rtype: tuple[str | None, ...]
         """
-        row: dict[str, bytes | str | None] = dict(
-            zip(
-                self.history_keys,
-                history_raw.strip().split(b"\t")
-            )
-        )
-        # Ensure all values are converted from binary to utf-8 strings and fill in missing keys
-        for k in self.history_keys:
-            if k not in row:
-                row[k] = ""
+        row = {}
+        for k, v in __history_import_map__.items():
+            if k in history:
+                # handle matching keys
+                row[k] = history[k].strip()
             else:
-                row[k] = row[k].decode('utf-8')
+                # handle non-matching keys
+                row[k] = ''
+                for match in v:
+                    if match in history:
+                        row[k] = history[match].strip()
+                        break
         # Appending the export date to the dictionary
         row["export_date"] = export_date
-        # Converting dates to the right format and fixing any dates that have been suppressed or invalid to None
         for k in ["election_date"]:
             if len(row[k]) < 10:
                 row[k] = None
@@ -139,27 +65,28 @@ def parse_raw_history_into_tuple(self, history_raw: bytes, export_date: str) ->
                 row[k] = datetime.datetime.strptime(row[k], "%m/%d/%Y").strftime('%Y-%m-%d')
         return tuple(row.values())
 
-    def parse_raw_voter_into_tuple(self, voter_raw: bytes, export_date: str) -> tuple[str | None, ...]:
+    @staticmethod
+    def parse_voter_into_tuple(voter: dict[str, str | None], export_date: str) -> tuple[str | None, ...]:
         """
         Build a temporary dictionary from raw voter binary string
 
-        :param bytes voter_raw: A byte string containing a raw row of voter data
+        :param dict[str, str | None] voter: A byte string containing a raw row of voter data
         :param str export_date: Export date string in YYYY-MM-DD format
         :return: A tuple of SQL ready prepared parameters
         :rtype: tuple[str | None, ...]
         """
-        row: dict[str, bytes | str | None] = dict(
-            zip(
-                self.voter_keys,
-                voter_raw.strip().split(b"\t")
-            )
-        )
-        # Ensure all values are converted from binary to utf-8 strings and fill in missing keys
-        for k in self.voter_keys:
-            if k not in row:
-                row[k] = ""
+        row = {}
+        for k, v in __voter_import_map__.items():
+            if k in voter:
+                # handle matching keys
+                row[k] = voter[k].strip()
             else:
-                row[k] = row[k].decode('utf-8')
+                # handle non-matching keys
+                row[k] = ''
+                for match in v:
+                    if match in voter:
+                        row[k] = voter[match].strip()
+                        break
         # Appending the export date to the dictionary
         row["export_date"] = export_date
         # Converting dates to the right format and fixing any dates that have been suppressed or invalid to None
@@ -169,7 +96,7 @@ def parse_raw_voter_into_tuple(self, voter_raw: bytes, export_date: str) -> tupl
             else:
                 row[k] = datetime.datetime.strptime(row[k], "%m/%d/%Y").strftime('%Y-%m-%d')
         # Blanking out any suppressed fields with * to empty string
-        for k in self.suppress_keys:
+        for k in __suppress_keys__:
             if row[k] == "*":
                 row[k] = ""
         # Ensuring email addresses are in lower case
@@ -187,46 +114,53 @@ def import_source(self, file: str, t: str) -> None:
         :return: None
         """
         self.db.init_schema()
-        try:
-            with zipfile.ZipFile(file, mode="r") as archive:
-                for info in archive.infolist():
-                    print(f"Filename: {info.filename}")
-                    print(f"Modified: {datetime.datetime(*info.date_time)}")
-                    print(f"Normal size: {info.file_size} bytes")
-                    print(f"Compressed size: {info.compress_size} bytes")
-                    print("-" * 20)
-                    data = []
-                    records_imported = 0
-                    for line in archive.read(info.filename).split(b"\n"):
-                        if len(line.strip()) >= 3:
-                            if t in self.valid_import_types.keys():
+        if t in self.valid_import_types.keys():
+            try:
+                with zipfile.ZipFile(file, mode="r") as archive:
+                    for info in archive.infolist():
+                        print(f"Filename: {info.filename}")
+                        print(f"Modified: {datetime.datetime(*info.date_time)}")
+                        print(f"Normal size: {info.file_size} bytes")
+                        print(f"Compressed size: {info.compress_size} bytes")
+                        print("-" * 20)
+                        data = []
+                        records_imported = 0
+                        with archive.open(info.filename, "r") as f:
+                            reader = csv.DictReader(
+                                io.TextIOWrapper(
+                                    f,
+                                    newline='\r\n',
+                                    encoding='utf-8',
+                                    errors='ignore'
+                                ),
+                                delimiter="\t",
+                                fieldnames=self.valid_import_types[t]["fields"]
+                            )
+                            for row in reader:
                                 if len(data) < self.db.batch_limits[t]:
                                     data.append(getattr(self, self.valid_import_types[t]["parse"])(
-                                        line,
+                                        row,
                                         datetime.datetime(*info.date_time).strftime("%Y-%m-%d")
                                     ))
                                 else:
                                     print(f"Importing batch of {len(data)} records from {info.filename}..")
                                     self.db.executemany_prepared_sql(
-                                        getattr(Warehouse.FloridaSQL, self.valid_import_types[t]["sql"])(),
+                                        getattr(StateSQL, self.valid_import_types[t]["sql"])(),
                                         data
                                     )
                                     records_imported += len(data)
                                     data = []
-                            else:
-                                raise ValueError(f"Usage: Type 't' {t} is not valid")
-                    if len(data) > 0:
-                        if t in self.valid_import_types.keys():
-                            print(f"Importing batch of {len(data)} records from {info.filename}..")
-                            self.db.executemany_prepared_sql(
-                                getattr(Warehouse.FloridaSQL, self.valid_import_types[t]["sql"])(),
-                                data
-                            )
-                            records_imported += len(data)
-                        else:
-                            raise ValueError(f"Usage: Type 't' {t} is not valid")
-                    print(f"{records_imported} total records imported")
-                    print("-" * 20)
-        except Exception as error:
-            print('Caught this error: ' + repr(error))
-            raise
+                            if len(data) > 0:
+                                print(f"Importing batch of {len(data)} records from {info.filename}..")
+                                self.db.executemany_prepared_sql(
+                                    getattr(StateSQL, self.valid_import_types[t]["sql"])(),
+                                    data
+                                )
+                                records_imported += len(data)
+                            print(f"{records_imported} total records imported")
+                            print("-" * 20)
+            except Exception as error:
+                print('Caught this error: ' + repr(error))
+                raise
+        else:
+            raise ValueError(f"Usage: Type 't' {t} is not valid")
diff --git a/Import/FloridaCodes.py b/Import/FloridaCodes.py
new file mode 100644
index 0000000..c6091e9
--- /dev/null
+++ b/Import/FloridaCodes.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+
+__history_import_map__ = {
+    "county_code": [],
+    "voter_id": [],
+    "election_date": [],
+    "election_type": [],
+    "history_code": []
+}
+
+__voter_import_map__ = {
+    "county_code": [],
+    "voter_id": [],
+    "name_last": [],
+    "name_suffix": [],
+    "name_first": [],
+    "name_middle": [],
+    "suppress_address": [],
+    "residence_address_line_1": [],
+    "residence_address_line_2": [],
+    "residence_city": [],
+    "residence_state": [],
+    "residence_zipcode": [],
+    "mailing_address_line_1": [],
+    "mailing_address_line_2": [],
+    "mailing_address_line_3": [],
+    "mailing_city": [],
+    "mailing_state": [],
+    "mailing_zipcode": [],
+    "mailing_country": [],
+    "gender": [],
+    "race": [],
+    "birth_date": [],
+    "registration_date": [],
+    "party_affiliation": [],
+    "precinct": [],
+    "precinct_group": [],
+    "precinct_split": [],
+    "precinct_suffix": [],
+    "voter_status": [],
+    "congressional_district": [],
+    "house_district": [],
+    "senate_district": [],
+    "county_commission_district": [],
+    "school_board_district": [],
+    "daytime_area_code": [],
+    "daytime_phone_number": [],
+    "daytime_phone_extension": [],
+    "email_address": []
+}
+
+__suppress_keys__ = [
+    "name_last",
+    "name_suffix",
+    "name_first",
+    "name_middle",
+    "residence_address_line_1",
+    "residence_address_line_2",
+    "residence_city",
+    "residence_state",
+    "residence_zipcode",
+    "mailing_address_line_1",
+    "mailing_address_line_2",
+    "mailing_address_line_3",
+    "mailing_city",
+    "mailing_state",
+    "mailing_zipcode",
+    "mailing_country",
+    "precinct",
+    "precinct_group",
+    "precinct_split",
+    "precinct_suffix",
+    "congressional_district",
+    "house_district",
+    "senate_district",
+    "county_commission_district",
+    "school_board_district",
+    "daytime_area_code",
+    "daytime_phone_number",
+    "daytime_phone_extension",
+    "email_address"
+]
diff --git a/Import/Georgia.py b/Import/Georgia.py
index 84c05be..c6790f3 100644
--- a/Import/Georgia.py
+++ b/Import/Georgia.py
@@ -1,16 +1,18 @@
 # -*- coding: utf-8 -*-
-import csv
+
 # Handles Raw data import methods for Georgia data
 
+import csv
 import datetime
 import io
 import zipfile
 
-import Warehouse.GeorgiaSQL
+import Warehouse.GeorgiaSQL as StateSQL
 from Import.State import State
-from Warehouse.GeorgiaCodes import __counties__
-from Warehouse.GeorgiaCodes import __election_types__
-from Warehouse.GeorgiaCodes import __parties__
+from Import.GeorgiaCodes import __counties__
+from Import.GeorgiaCodes import __election_types__
+from Import.GeorgiaCodes import __parties__
+from Import.GeorgiaCodes import __history_import_map__
 
 
 class Georgia(State):
@@ -29,24 +31,6 @@ class Georgia(State):
         }
     }
 
-    history_keys = [
-        "county_code",
-        "voter_id",
-        "election_date",
-        "election_type",
-        "party",
-        "ballot_style",
-        "absentee",
-        "provisional",
-        "supplemental"
-    ]
-
-    @property
-    def voter_keys(self):
-        pass
-
-    suppress_keys = []
-
     def import_source(self, file: str, t: str) -> None:
         """
         import_source Reads in a Voter or History File in Zip format and sends it to the datastore.
@@ -80,7 +64,7 @@ def import_source(self, file: str, t: str) -> None:
                                 else:
                                     print(f"Importing batch of {len(data)} records from {info.filename}..")
                                     self.db.executemany_prepared_sql(
-                                        getattr(Warehouse.GeorgiaSQL, self.valid_import_types[t]["sql"])(),
+                                        getattr(StateSQL, self.valid_import_types[t]["sql"])(),
                                         data
                                     )
                                     records_imported += len(data)
@@ -91,7 +75,7 @@ def import_source(self, file: str, t: str) -> None:
                             if t in self.valid_import_types.keys():
                                 print(f"Importing batch of {len(data)} records from {info.filename}..")
                                 self.db.executemany_prepared_sql(
-                                    getattr(Warehouse.GeorgiaSQL, self.valid_import_types[t]["sql"])(),
+                                    getattr(StateSQL, self.valid_import_types[t]["sql"])(),
                                     data
                                 )
                                 records_imported += len(data)
@@ -151,7 +135,23 @@ def get_county_code(name: str) -> str:
                 list(__counties__.values()).index('UNKNOWN')
             ]
 
-    def parse_history_into_tuple(self, history: dict) -> tuple[str | None, ...]:
+    @staticmethod
+    def get_election_type(name: str) -> str:
+        """
+        Convert a county name to its code
+
+        :param str name: The long name for election tpe
+        :return: The election type code
+        :rtype str
+        """
+        if name == '':
+            name = "UNKNOWN"
+        return list(__election_types__.keys())[
+            list(__election_types__.values()).index(name)
+        ]
+
+    @staticmethod
+    def parse_history_into_tuple(history: dict) -> tuple[str | None, ...]:
         """
         Build a temporary dictionary from raw voter binary string
 
@@ -159,22 +159,31 @@ def parse_history_into_tuple(self, history: dict) -> tuple[str | None, ...]:
         :return: A tuple of SQL ready prepared parameters
         :rtype: tuple[str | None, ...]
         """
-        history = dict(zip(self.history_keys, list(history.values())))
-        history['county_code'] = Georgia.get_county_code(history['county_code'])
-        history['party'] = Georgia.get_party_code(history['party'])
-
-        if history['election_type'] == '':
-            history['election_type'] = "UNKNOWN"
-        history['election_type'] = list(__election_types__.keys())[
-            list(__election_types__.values()).index(history['election_type'])
-        ]
-        if history['voter_id'] == '':
-            history['voter_id'] = 0
+        row = {}
+        for k, v in __history_import_map__.items():
+            if k in history:
+                # handle matching keys
+                row[k] = history[k].strip()
+            else:
+                # handle non-matching keys
+                row[k] = ''
+                for match in v:
+                    if match in history:
+                        row[k] = history[match].strip()
+                        break
         for k in ["election_date"]:
-            history[k] = datetime.datetime.strptime(history[k], "%m/%d/%Y").strftime('%Y-%m-%d')
+            if len(row[k]) < 10:
+                row[k] = None
+            else:
+                row[k] = datetime.datetime.strptime(row[k], "%m/%d/%Y").strftime('%Y-%m-%d')
         for k in ["absentee", "provisional", "supplemental"]:
-            if history[k].upper() == 'Y':
-                history[k] = 1
+            if row[k].upper() == 'Y':
+                row[k] = 1
             else:
-                history[k] = 0
-        return tuple(history.values())
+                row[k] = 0
+        row['county_code'] = Georgia.get_county_code(row['county_code'])
+        row['party'] = Georgia.get_party_code(row['party'])
+        row['election_type'] = Georgia.get_election_type(row['election_type'])
+        if row['voter_id'] == '':
+            row['voter_id'] = 0
+        return tuple(row.values())
diff --git a/Warehouse/GeorgiaCodes.py b/Import/GeorgiaCodes.py
similarity index 91%
rename from Warehouse/GeorgiaCodes.py
rename to Import/GeorgiaCodes.py
index 8d20488..44ad26e 100644
--- a/Warehouse/GeorgiaCodes.py
+++ b/Import/GeorgiaCodes.py
@@ -1,3 +1,18 @@
+# -*- coding: utf-8 -*-
+
+__history_import_map__ = {
+    "county_code": ["County Name"],
+    "voter_id": ["Voter Registration Number"],
+    "election_date": ["Election Date"],
+    "election_type": ["Election Type"],
+    "party": ["Party"],
+    "ballot_style": ["Ballot Style"],
+    "absentee": ["Absentee"],
+    "provisional": ["Provisional"],
+    "supplemental": ["Supplemental"]
+}
+
+
 __parties__ = {
     "D": "Democratic",
     "R": "Republican",
diff --git a/Import/NorthCarolina.py b/Import/NorthCarolina.py
index ab3346f..d6d5121 100644
--- a/Import/NorthCarolina.py
+++ b/Import/NorthCarolina.py
@@ -1,12 +1,15 @@
 # -*- coding: utf-8 -*-
-import csv
+
 # Handles Raw data import methods for North Carolina data
 
+import csv
 import datetime
 import io
 import zipfile
 
-import Warehouse.NorthCarolinaSQL
+import Warehouse.NorthCarolinaSQL as StateSQL
+from Import.NorthCarolinaCodes import __history_import_map__
+from Import.NorthCarolinaCodes import __voter_import_map__
 from Import.State import State
 
 
@@ -26,96 +29,6 @@ class NorthCarolina(State):
         }
     }
 
-    history_keys = [
-        "county_code",
-        "county_name",
-        "voter_id",
-        "election_date",
-        "election_type",
-        "voting_method",
-        "party_code",
-        "party_name",
-        "precinct_code",
-        "precinct_name",
-        "ncid",
-        "voted_county_code",
-        "voted_county_name",
-        "voter_tabulated_district_code",
-        "voter_tabulated_district_name"
-    ]
-
-    voter_keys = {
-        "voter_id": ["voter_reg_num"],
-        "county_code": ["county_id"],
-        "county_name": ["county_desc"],
-        "ncid": [],
-        "name_last": ["last_name"],
-        "name_first": ["first_name"],
-        "name_middle": ["middle_name"],
-        "name_suffix": ["name_suffix_lbl"],
-        "voter_status": ["status_cd"],
-        "voter_status_desc": [],
-        "voter_status_reason_code": ["reason_cd"],
-        "voter_status_reason_desc": [],
-        "residence_address": ["res_street_address"],
-        "residence_city": ["res_city_desc"],
-        "residence_state": ["state_cd"],
-        "residence_zipcode": ["zip_code"],
-        "mailing_address_line_1": ["mail_addr1"],
-        "mailing_address_line_2": ["mail_addr2"],
-        "mailing_address_line_3": ["mail_addr3"],
-        "mailing_address_line_4": ["mail_addr4"],
-        "mailing_city": ["mail_city"],
-        "mailing_state": ["mail_state"],
-        "mailing_zipcode": ["mail_zipcode"],
-        "daytime_phone": ["full_phone_number"],
-        "confidential": ["confidential_ind"],
-        "registration_date": ["registr_dt"],
-        "race_code": [],
-        "ethnic_code": [],
-        "party_code": ["party_cd"],
-        "gender_code": [],
-        "birth_year": [],
-        "age_at_year_end": [],
-        "birth_state": [],
-        "drivers_lic": [],
-        "precinct": ["precinct_abbrv"],
-        "precinct_desc": [],
-        "municipality": ["municipality_abbrv"],
-        "municipality_desc": [],
-        "ward": ["ward_abbrv"],
-        "ward_desc": [],
-        "congressional_district": ["cong_dist_abbrv"],
-        "superior_court_jurisdiction": ["super_court_abbrv"],
-        "judicial_district": ["judic_dist_abbrv"],
-        "senate_district": ["nc_senate_abbrv"],
-        "house_district": ["nc_house_abbrv"],
-        "county_commission_district": ["county_commiss_abbrv"],
-        "county_commission_district_desc": ["county_commiss_desc"],
-        "township_jurisdiction": ["township_abbrv"],
-        "township_jurisdiction_desc": ["township_desc"],
-        "school_district": ["school_dist_abbrv"],
-        "school_district_desc": ["school_dist_desc"],
-        "fire_district": ["fire_dist_abbrv"],
-        "fire_district_desc": ["fire_dist_desc"],
-        "water_district": ["water_dist_abbrv"],
-        "water_district_desc": ["water_dist_desc"],
-        "sewer_district": ["sewer_dist_abbrv"],
-        "sewer_district_desc": ["sewer_dist_desc"],
-        "sanitation_district": ["sanit_dist_abbrv"],
-        "sanitation_district_desc": ["sanit_dist_desc"],
-        "rescue_district": ["rescue_dist_abbrv"],
-        "rescue_district_desc": ["rescue_dist_desc"],
-        "municipal_district": ["munic_dist_abbrv"],
-        "municipal_district_desc": ["munic_dist_desc"],
-        "prosecutorial_district": ["dist_1_abbrv"],
-        "prosecutorial_district_desc": ["dist_1_desc"],
-        "voter_tabulated_district_code": ["vtd_abbrv"],
-        "voter_tabulated_district_name": ["vtd_desc"]
-    }
-
-    suppress_keys = []
-
     def import_source(self, file: str, t: str) -> None:
         """
         import_source Reads in a Voter or History File in Zip format and sends it to the datastore.
@@ -154,7 +67,7 @@ def import_source(self, file: str, t: str) -> None:
                                 else:
                                     print(f"Importing batch of {len(data)} records from {info.filename}..")
                                     self.db.executemany_prepared_sql(
-                                        getattr(Warehouse.NorthCarolinaSQL, self.valid_import_types[t]["sql"])(),
+                                        getattr(StateSQL, self.valid_import_types[t]["sql"])(),
                                         data
                                     )
                                     records_imported += len(data)
@@ -165,7 +78,7 @@ def import_source(self, file: str, t: str) -> None:
                             if t in self.valid_import_types.keys():
                                 print(f"Importing batch of {len(data)} records from {info.filename}..")
                                 self.db.executemany_prepared_sql(
-                                    getattr(Warehouse.NorthCarolinaSQL, self.valid_import_types[t]["sql"])(),
+                                    getattr(StateSQL, self.valid_import_types[t]["sql"])(),
                                     data
                                 )
                                 records_imported += len(data)
@@ -177,22 +90,36 @@ def import_source(self, file: str, t: str) -> None:
             print('Caught this error: ' + repr(error))
             raise
 
-    def parse_history_into_tuple(self, history: dict) -> tuple[str | None, ...]:
+    @staticmethod
+    def parse_history_into_tuple(history: dict[str, str | None]) -> tuple[str | None, ...]:
         """
         Build a temporary dictionary from raw voter binary string
 
-        :param bytes history: A byte string containing a raw row of history data
+        :param dict history: A byte string containing a raw row of history data
         :return: A tuple of SQL ready prepared parameters
         :rtype: tuple[str | None, ...]
         """
-        history = dict(zip(self.history_keys, list(history.values())))
-        if history['voter_id'] == '':
-            history['voter_id'] = 0
+        row = {}
+        for k, v in __history_import_map__.items():
+            if k in history:
+                # handle matching keys
+                row[k] = history[k].strip()
+            else:
+                # handle non-matching keys
+                row[k] = ''
+                for match in v:
+                    if match in history:
+                        row[k] = history[match].strip()
+                        break
         for k in ["election_date"]:
-            history[k] = datetime.datetime.strptime(history[k], "%m/%d/%Y").strftime('%Y-%m-%d')
-        return tuple(history.values())
+            if len(row[k]) < 10:
+                row[k] = None
+            else:
+                row[k] = datetime.datetime.strptime(row[k], "%m/%d/%Y").strftime('%Y-%m-%d')
+        return tuple(row.values())
 
-    def parse_voter_into_tuple(self, voter: dict[str, str | None]) -> tuple[str | None, ...]:
+    @staticmethod
+    def parse_voter_into_tuple(voter: dict[str, str | None]) -> tuple[str | None, ...]:
         """
         Build a temporary dictionary from raw voter import dictionary
 
@@ -201,7 +128,7 @@ def parse_voter_into_tuple(self, voter: dict[str, str | None]) -> tuple[str | No
         :rtype: tuple[str | None, ...]
         """
         row = {}
-        for k, v in self.voter_keys.items():
+        for k, v in __voter_import_map__.items():
             if k in voter:
                 # handle matching keys
                 row[k] = voter[k].strip()
diff --git a/Import/NorthCarolinaCodes.py b/Import/NorthCarolinaCodes.py
new file mode 100644
index 0000000..c46a856
--- /dev/null
+++ b/Import/NorthCarolinaCodes.py
@@ -0,0 +1,193 @@
+# -*- coding: utf-8 -*-
+
+__counties__ = {
+    "1": "ALAMANCE",
+    "2": "ALEXANDER",
+    "3": "ALLEGHANY",
+    "4": "ANSON",
+    "5": "ASHE",
+    "6": "AVERY",
+    "7": "BEAUFORT",
+    "8": "BERTIE",
+    "9": "BLADEN",
+    "10": "BRUNSWICK",
+    "11": "BUNCOMBE",
+    "12": "BURKE",
+    "13": "CABARRUS",
+    "14": "CALDWELL",
+    "15": "CAMDEN",
+    "16": "CARTERET",
+    "17": "CASWELL",
+    "18": "CATAWBA",
+    "19": "CHATHAM",
+    "20": "CHEROKEE",
+    "21": "CHOWAN",
+    "22": "CLAY",
+    "23": "CLEVELAND",
+    "24": "COLUMBUS",
+    "25": "CRAVEN",
+    "26": "CUMBERLAND",
+    "27": "CURRITUCK",
+    "28": "DARE",
+    "29": "DAVIDSON",
+    "30": "DAVIE",
+    "31": "DUPLIN",
+    "32": "DURHAM",
+    "33": "EDGECOMBE",
+    "34": "FORSYTH",
+    "35": "FRANKLIN",
+    "36": "GASTON",
+    "37": "GATES",
+    "38": "GRAHAM",
+    "39": "GRANVILLE",
+    "40": "GREENE",
+    "41": "GUILFORD",
+    "42": "HALIFAX",
+    "43": "HARNETT",
+    "44": "HAYWOOD",
+    "45": "HENDERSON",
+    "46": "HERTFORD",
+    "47": "HOKE",
+    "48": "HYDE",
+    "49": "IREDELL",
+    "50": "JACKSON",
+    "51": "JOHNSTON",
+    "52": "JONES",
+    "53": "LEE",
+    "54": "LENOIR",
+    "55": "LINCOLN",
+    "56": "MACON",
+    "57": "MADISON",
+    "58": "MARTIN",
+    "59": "MCDOWELL",
+    "60": "MECKLENBURG",
+    "61": "MITCHELL",
+    "62": "MONTGOMERY",
+    "63": "MOORE",
+    "64": "NASH",
+    "65": "NEWHANOVER",
+    "66": "NORTHAMPTON",
+    "67": "ONSLOW",
+    "68": "ORANGE",
+    "69": "PAMLICO",
+    "70": "PASQUOTANK",
+    "71": "PENDER",
+    "72": "PERQUIMANS",
+    "73": "PERSON",
+    "74": "PITT",
+    "75": "POLK",
+    "76": "RANDOLPH",
+    "77": "RICHMOND",
+    "78": "ROBESON",
+    "79": "ROCKINGHAM",
+    "80": "ROWAN",
+    "81": "RUTHERFORD",
+    "82": "SAMPSON",
+    "83": "SCOTLAND",
+    "84": "STANLY",
+    "85": "STOKES",
+    "86": "SURRY",
+    "87": "SWAIN",
+    "88": "TRANSYLVANIA",
+    "89": "TYRRELL",
+    "90": "UNION",
+    "91": "VANCE",
+    "92": "WAKE",
+    "93": "WARREN",
+    "94": "WASHINGTON",
+    "95": "WATAUGA",
+    "96": "WAYNE",
+    "97": "WILKES",
+    "98": "WILSON",
+    "99": "YADKIN",
+    "00": "YANCEY",
+    "999": "UNKNOWN"
+}
+
+__voter_import_map__ = {
+    "voter_id": ["voter_reg_num"],
+    "county_code": ["county_id"],
+    "county_name": ["county_desc"],
+    "ncid": [],
+    "name_last": ["last_name"],
+    "name_first": ["first_name"],
+    "name_middle": ["middle_name"],
+    "name_suffix": ["name_suffix_lbl"],
+    "voter_status": ["status_cd"],
+    "voter_status_desc": [],
+    "voter_status_reason_code": ["reason_cd"],
+    "voter_status_reason_desc": [],
+    "residence_address": ["res_street_address"],
+    "residence_city": ["res_city_desc"],
+    "residence_state": ["state_cd"],
+    "residence_zipcode": ["zip_code"],
+    "mailing_address_line_1": ["mail_addr1"],
+    "mailing_address_line_2": ["mail_addr2"],
+    "mailing_address_line_3": ["mail_addr3"],
+    "mailing_address_line_4": ["mail_addr4"],
+    "mailing_city": ["mail_city"],
+    "mailing_state": ["mail_state"],
+    "mailing_zipcode": ["mail_zipcode"],
+    "daytime_phone": ["full_phone_number"],
+    "confidential": ["confidential_ind"],
+    "registration_date": ["registr_dt"],
+    "race_code": [],
+    "ethnic_code": [],
+    "party_code": ["party_cd"],
+    "gender_code": [],
+    "birth_year": [],
+    "age_at_year_end": [],
+    "birth_state": [],
+    "drivers_lic": [],
+    "precinct": ["precinct_abbrv"],
+    "precinct_desc": [],
+    "municipality": ["municipality_abbrv"],
+    "municipality_desc": [],
+    "ward": ["ward_abbrv"],
+    "ward_desc": [],
+    "congressional_district": ["cong_dist_abbrv"],
+    "superior_court_jurisdiction": ["super_court_abbrv"],
+    "judicial_district": ["judic_dist_abbrv"],
+    "senate_district": ["nc_senate_abbrv"],
+    "house_district": ["nc_house_abbrv"],
+    "county_commission_district": ["county_commiss_abbrv"],
+    "county_commission_district_desc": ["county_commiss_desc"],
+    "township_jurisdiction": ["township_abbrv"],
+    "township_jurisdiction_desc": ["township_desc"],
+    "school_district": ["school_dist_abbrv"],
+    "school_district_desc": ["school_dist_desc"],
+    "fire_district": ["fire_dist_abbrv"],
+    "fire_district_desc": ["fire_dist_desc"],
+    "water_district": ["water_dist_abbrv"],
+    "water_district_desc": ["water_dist_desc"],
+    "sewer_district": ["sewer_dist_abbrv"],
+    "sewer_district_desc": ["sewer_dist_desc"],
+    "sanitation_district": ["sanit_dist_abbrv"],
+    "sanitation_district_desc": ["sanit_dist_desc"],
+    "rescue_district": ["rescue_dist_abbrv"],
+    "rescue_district_desc": ["rescue_dist_desc"],
+    "municipal_district": ["munic_dist_abbrv"],
+    "municipal_district_desc": ["munic_dist_desc"],
+    "prosecutorial_district": ["dist_1_abbrv"],
+    "prosecutorial_district_desc": ["dist_1_desc"],
+    "voter_tabulated_district_code": ["vtd_abbrv"],
+    "voter_tabulated_district_name": ["vtd_desc"]
+}
+
+__history_import_map__ = {
+    "county_code": ["county_id"],
+    "county_name": ["county_desc"],
+    "voter_id": ["voter_reg_num"],
+    "election_date": ["election_lbl"],
+    "election_type": ["election_desc"],
+    "voting_method": [],
+    "party_code": ["voted_party_cd"],
+    "party_name": ["voted_party_desc"],
+    "precinct_code": ["pct_label"],
+    "precinct_name": ["pct_description"],
+    "ncid": [],
+    "voted_county_code": ["voted_county_id"],
+    "voted_county_name": ["voted_county_desc"],
+    "voter_tabulated_district_code": ["vtd_label"],
+    "voter_tabulated_district_name": ["vtd_description"]
+}
diff --git a/Import/State.py b/Import/State.py
index d2d408a..82168d3 100644
--- a/Import/State.py
+++ b/Import/State.py
@@ -18,21 +18,6 @@ class State(ABC):
     def valid_import_types(self):
         pass
 
-    @property
-    @abstractmethod
-    def history_keys(self):
-        pass
-
-    @property
-    @abstractmethod
-    def voter_keys(self):
-        pass
-
-    @property
-    @abstractmethod
-    def suppress_keys(self):
-        pass
-
     def __init__(self, db: Warehouse.State) -> None:
         """
         __init__ Sets the instance of Warehouse.Florida to a class variable named 'db'.
diff --git a/Warehouse/Georgia.py b/Warehouse/Georgia.py
index 9e3cdbb..31d21f1 100644
--- a/Warehouse/Georgia.py
+++ b/Warehouse/Georgia.py
@@ -1,6 +1,6 @@
 import Warehouse.GeorgiaSQL
 from Warehouse.State import State
-from Warehouse.GeorgiaCodes import __counties__
+from Import.GeorgiaCodes import __counties__
 
 
 class Georgia(State):
diff --git a/Warehouse/NorthCarolina.py b/Warehouse/NorthCarolina.py
index 83d31f8..8530d35 100644
--- a/Warehouse/NorthCarolina.py
+++ b/Warehouse/NorthCarolina.py
@@ -1,6 +1,8 @@
+# -*- coding: utf-8 -*-
+
 import Warehouse.NorthCarolinaSQL
 from Warehouse.State import State
-from Warehouse.NorthCarolinaCodes import __counties__
+from Import.NorthCarolinaCodes import __counties__
 
 
 class NorthCarolina(State):
diff --git a/Warehouse/NorthCarolinaCodes.py b/Warehouse/NorthCarolinaCodes.py
deleted file mode 100644
index 2d8e7c0..0000000
--- a/Warehouse/NorthCarolinaCodes.py
+++ /dev/null
@@ -1,129 +0,0 @@
-__voters_download_url__ = "https://s3.amazonaws.com/dl.ncsbe.gov/data/ncvoter_Statewide.zip"
-
-__voters_registration_snapshots__ = "https://dl.ncsbe.gov/index.html?prefix=data/Snapshots/"
-
-__counties__ = {
-    "1": "ALAMANCE",
-    "2": "ALEXANDER",
-    "3": "ALLEGHANY",
-    "4": "ANSON",
-    "5": "ASHE",
-    "6": "AVERY",
-    "7": "BEAUFORT",
-    "8": "BERTIE",
-    "9": "BLADEN",
-    "10": "BRUNSWICK",
-    "11": "BUNCOMBE",
-    "12": "BURKE",
-    "13": "CABARRUS",
-    "14": "CALDWELL",
-    "15": "CAMDEN",
-    "16": "CARTERET",
-    "17": "CASWELL",
-    "18": "CATAWBA",
-    "19": "CHATHAM",
-    "20": "CHEROKEE",
-    "21": "CHOWAN",
-    "22": "CLAY",
-    "23": "CLEVELAND",
-    "24": "COLUMBUS",
-    "25": "CRAVEN",
-    "26": "CUMBERLAND",
-    "27": "CURRITUCK",
-    "28": "DARE",
-    "29": "DAVIDSON",
-    "30": "DAVIE",
-    "31": "DUPLIN",
-    "32": "DURHAM",
-    "33": "EDGECOMBE",
-    "34": "FORSYTH",
-    "35": "FRANKLIN",
-    "36": "GASTON",
-    "37": "GATES",
-    "38": "GRAHAM",
-    "39": "GRANVILLE",
-    "40": "GREENE",
-    "41": "GUILFORD",
-    "42": "HALIFAX",
-    "43": "HARNETT",
-    "44": "HAYWOOD",
-    "45": "HENDERSON",
-    "46": "HERTFORD",
-    "47": "HOKE",
-    "48": "HYDE",
-    "49": "IREDELL",
-    "50": "JACKSON",
-    "51": "JOHNSTON",
-    "52": "JONES",
-    "53": "LEE",
-    "54": "LENOIR",
-    "55": "LINCOLN",
-    "56": "MACON",
-    "57": "MADISON",
-    "58": "MARTIN",
-    "59": "MCDOWELL",
-    "60": "MECKLENBURG",
-    "61": "MITCHELL",
-    "62": "MONTGOMERY",
-    "63": "MOORE",
-    "64": "NASH",
-    "65": "NEWHANOVER",
-    "66": "NORTHAMPTON",
-    "67": "ONSLOW",
-    "68": "ORANGE",
-    "69": "PAMLICO",
-    "70": "PASQUOTANK",
-    "71": "PENDER",
-    "72": "PERQUIMANS",
-    "73": "PERSON",
-    "74": "PITT",
-    "75": "POLK",
-    "76": "RANDOLPH",
-    "77": "RICHMOND",
-    "78": "ROBESON",
-    "79": "ROCKINGHAM",
-    "80": "ROWAN",
-    "81": "RUTHERFORD",
-    "82": "SAMPSON",
-    "83": "SCOTLAND",
-    "84": "STANLY",
-    "85": "STOKES",
-    "86": "SURRY",
-    "87": "SWAIN",
-    "88": "TRANSYLVANIA",
-    "89": "TYRRELL",
-    "90": "UNION",
-    "91": "VANCE",
-    "92": "WAKE",
-    "93": "WARREN",
-    "94": "WASHINGTON",
-    "95": "WATAUGA",
-    "96": "WAYNE",
-    "97": "WILKES",
-    "98": "WILSON",
-    "99": "YADKIN",
-    "00": "YANCEY",
-    "999": "UNKNOWN"
-}
-
-__election_types__ = {
-
-}
-
-__history_import_columns__ = [
-    "county_id",
-    "county_desc",
-    "voter_reg_num",
-    "election_lbl",
-    "election_desc",
-    "voting_method",
-    "voted_party_cd",
-    "voted_party_desc",
-    "pct_label",
-    "pct_description",
-    "ncid",
-    "voted_county_id",
-    "voted_county_desc",
-    "vtd_label",
-    "vtd_description"
-]
diff --git a/Warehouse/version.py b/Warehouse/version.py
index c860ad0..adc4406 100644
--- a/Warehouse/version.py
+++ b/Warehouse/version.py
@@ -2,4 +2,4 @@
 # 1) we don't load dependencies by storing it in __init__.py
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it into your module module
-__version__ = '3.4.0'
+__version__ = '3.4.1'