From 4b1f88f1d01f1c563dc2af3c73a772107fe303d5 Mon Sep 17 00:00:00 2001
From: Landon Wark <lwark@CSCScience.ca>
Date: Mon, 23 Oct 2023 09:36:57 -0500
Subject: [PATCH] Pre-removal of constructors module.

---
 TODO.md                                       |   6 +-
 src/submissions/__init__.py                   |   2 +-
 .../backend/db/functions/__init__.py          |   2 +-
 .../backend/db/functions/constructions.py     | 492 +++++++++---------
 .../backend/db/functions/lookups.py           |  16 +-
 src/submissions/backend/db/functions/misc.py  |   1 +
 src/submissions/backend/db/models/__init__.py |  51 +-
 src/submissions/backend/db/models/kits.py     |  11 +-
 .../backend/db/models/organizations.py        |   7 +
 .../backend/db/models/submissions.py          | 125 +++--
 src/submissions/backend/excel/parser.py       |  59 ++-
 src/submissions/backend/validators/pydant.py  | 266 +++++++++-
 src/submissions/frontend/__init__.py          |  30 +-
 .../frontend/custom_widgets/misc.py           |  12 +-
 .../frontend/main_window_functions.py         |  70 +--
 src/submissions/tools/__init__.py             |  58 +--
 16 files changed, 751 insertions(+), 457 deletions(-)

diff --git a/TODO.md b/TODO.md
index 690c5a8..1ce37d7 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,4 +1,8 @@
-- [ ] Validate form data using pydantic.
+- [x] Create custom store methods for submission, reagent and sample.
+- [x] Make pydantic models for other things that use constructors.
+- [x] Move backend.db.functions.constructor functions into Pydantic models.
+    - This will allow for better data validation.
+    - Parser -> Pydantic(validation) -> Form(user input) -> Pydantic(validation) -> SQL
 - [x] Rebuild RSLNamer and fix circular imports
     - Should be used when coming in to parser and when leaving form. NO OTHER PLACES.
 - [x] Change 'check_is_power_user' to decorator.
diff --git a/src/submissions/__init__.py b/src/submissions/__init__.py
index 8cf1891..c87c8ad 100644
--- a/src/submissions/__init__.py
+++ b/src/submissions/__init__.py
@@ -4,7 +4,7 @@ from pathlib import Path
 
 # Version of the realpython-reader package
 __project__ = "submissions"
-__version__ = "202310.2b"
+__version__ = "202310.4b"
 __author__ = {"name":"Landon Wark", "email":"Landon.Wark@phac-aspc.gc.ca"}
 __copyright__ = "2022-2023, Government of Canada"
 
diff --git a/src/submissions/backend/db/functions/__init__.py b/src/submissions/backend/db/functions/__init__.py
index b967e87..691846f 100644
--- a/src/submissions/backend/db/functions/__init__.py
+++ b/src/submissions/backend/db/functions/__init__.py
@@ -87,5 +87,5 @@ def store_object(ctx:Settings, object) -> dict|None:
     return None
 
 from .lookups import *
-from .constructions import *
+# from .constructions import *
 from .misc import *
diff --git a/src/submissions/backend/db/functions/constructions.py b/src/submissions/backend/db/functions/constructions.py
index 08aca11..b9ade0e 100644
--- a/src/submissions/backend/db/functions/constructions.py
+++ b/src/submissions/backend/db/functions/constructions.py
@@ -11,266 +11,270 @@ from dateutil.parser import parse
 from typing import Tuple
 from sqlalchemy.exc import IntegrityError, SAWarning
 from . import store_object
+from backend.validators import RSLNamer
 
 logger = logging.getLogger(f"submissions.{__name__}")
 
-def construct_reagent(ctx:Settings, info_dict:dict) -> models.Reagent:
-    """
-    Construct reagent object from dictionary
+# def construct_reagent(ctx:Settings, info_dict:dict) -> models.Reagent:
+#     """
+#     Construct reagent object from dictionary
+#     NOTE: Depreciated in favour of Pydantic model .toSQL method
 
-    Args:
-        ctx (Settings): settings object passed down from gui
-        info_dict (dict): dictionary to be converted
+#     Args:
+#         ctx (Settings): settings object passed down from gui
+#         info_dict (dict): dictionary to be converted
 
-    Returns:
-        models.Reagent: Constructed reagent object
-    """    
-    reagent = models.Reagent()
-    for item in info_dict:
-        logger.debug(f"Reagent info item for {item}: {info_dict[item]}")
-        # set fields based on keys in dictionary
-        match item:
-            case "lot":
-                reagent.lot = info_dict[item].upper()
-            case "expiry":
-                if isinstance(info_dict[item], date):
-                    reagent.expiry = info_dict[item]
-                else:
-                    reagent.expiry = parse(info_dict[item]).date()
-            case "type":
-                reagent_type = lookup_reagent_types(ctx=ctx, name=info_dict[item])
-                if reagent_type != None:
-                    reagent.type.append(reagent_type)
-            case "name":
-                if item == None:
-                    reagent.name = reagent.type.name
-                else:
-                    reagent.name = info_dict[item]
-    # add end-of-life extension from reagent type to expiry date
-    # NOTE: this will now be done only in the reporting phase to account for potential changes in end-of-life extensions
-    return reagent
+#     Returns:
+#         models.Reagent: Constructed reagent object
+#     """    
+#     reagent = models.Reagent()
+#     for item in info_dict:
+#         logger.debug(f"Reagent info item for {item}: {info_dict[item]}")
+#         # set fields based on keys in dictionary
+#         match item:
+#             case "lot":
+#                 reagent.lot = info_dict[item].upper()
+#             case "expiry":
+#                 if isinstance(info_dict[item], date):
+#                     reagent.expiry = info_dict[item]
+#                 else:
+#                     reagent.expiry = parse(info_dict[item]).date()
+#             case "type":
+#                 reagent_type = lookup_reagent_types(ctx=ctx, name=info_dict[item])
+#                 if reagent_type != None:
+#                     reagent.type.append(reagent_type)
+#             case "name":
+#                 if item == None:
+#                     reagent.name = reagent.type.name
+#                 else:
+#                     reagent.name = info_dict[item]
+#     # add end-of-life extension from reagent type to expiry date
+#     # NOTE: this will now be done only in the reporting phase to account for potential changes in end-of-life extensions
+#     return reagent
 
-def construct_submission_info(ctx:Settings, info_dict:dict) -> Tuple[models.BasicSubmission, dict]:
-    """
-    Construct submission object from dictionary pulled from gui form
+# def construct_submission_info(ctx:Settings, info_dict:dict) -> Tuple[models.BasicSubmission, dict]:
+#     """
+#     Construct submission object from dictionary pulled from gui form
+#     NOTE: Depreciated in favour of Pydantic model .toSQL method
 
-    Args:
-        ctx (Settings): settings object passed down from gui
-        info_dict (dict): dictionary to be transformed
+#     Args:
+#         ctx (Settings): settings object passed down from gui
+#         info_dict (dict): dictionary to be transformed
 
-    Returns:
-        models.BasicSubmission: Constructed submission object
-    """
-    # convert submission type into model name
-    # model = get_polymorphic_subclass(polymorphic_identity=info_dict['submission_type'])
-    model = models.BasicSubmission.find_polymorphic_subclass(polymorphic_identity=info_dict['submission_type'])
-    logger.debug(f"We've got the model: {type(model)}")
-    # Ensure an rsl plate number exists for the plate
-    if not check_regex_match("^RSL", info_dict["rsl_plate_num"]):
-        instance = None
-        msg = "A proper RSL plate number is required."
-        return instance, {'code': 2, 'message': "A proper RSL plate number is required."}
-    # else:
-    #     # enforce conventions on the rsl plate number from the form
-    #     # info_dict['rsl_plate_num'] = RSLNamer(ctx=ctx, instr=info_dict["rsl_plate_num"]).parsed_name
-    #     info_dict['rsl_plate_num'] = RSLNamer(ctx=ctx, instr=info_dict["rsl_plate_num"], sub_type=info_dict['submission_type']).parsed_name
-    # check database for existing object
-    instance = lookup_submissions(ctx=ctx, rsl_number=info_dict['rsl_plate_num'])
-    # get model based on submission type converted above
-    # logger.debug(f"Looking at models for submission type: {query}")
+#     Returns:
+#         models.BasicSubmission: Constructed submission object
+#     """
+#     # convert submission type into model name
+#     # model = get_polymorphic_subclass(polymorphic_identity=info_dict['submission_type'])
+#     model = models.BasicSubmission.find_polymorphic_subclass(polymorphic_identity=info_dict['submission_type'])
+#     logger.debug(f"We've got the model: {type(model)}")
+#     # Ensure an rsl plate number exists for the plate
+#     if not check_regex_match("^RSL", info_dict["rsl_plate_num"]):
+#         instance = None
+#         msg = "A proper RSL plate number is required."
+#         return instance, {'code': 2, 'message': "A proper RSL plate number is required."}
+#     else:
+#     #     # enforce conventions on the rsl plate number from the form
+#     #     # info_dict['rsl_plate_num'] = RSLNamer(ctx=ctx, instr=info_dict["rsl_plate_num"]).parsed_name
+#         info_dict['rsl_plate_num'] = RSLNamer(ctx=ctx, instr=info_dict["rsl_plate_num"], sub_type=info_dict['submission_type']).parsed_name
+#     # check database for existing object
+#     instance = lookup_submissions(ctx=ctx, rsl_number=info_dict['rsl_plate_num'])
+#     # get model based on submission type converted above
+#     # logger.debug(f"Looking at models for submission type: {query}")
     
-    # if query return nothing, ie doesn't already exist in db
-    if instance == None:
-        instance = model()
-        logger.debug(f"Submission doesn't exist yet, creating new instance: {instance}")
-        msg = None
-        code = 0
-    else:
-        code = 1
-        msg = "This submission already exists.\nWould you like to overwrite?"
-    for item in info_dict:
-        value = info_dict[item]
-        logger.debug(f"Setting {item} to {value}")
-        # set fields based on keys in dictionary
-        match item:
-            case "extraction_kit":
-                logger.debug(f"Looking up kit {value}")
-                field_value = lookup_kit_types(ctx=ctx, name=value)
-                logger.debug(f"Got {field_value} for kit {value}")
-            case "submitting_lab":
-                logger.debug(f"Looking up organization: {value}")
-                field_value = lookup_organizations(ctx=ctx, name=value)
-                logger.debug(f"Got {field_value} for organization {value}")
-            case "submitter_plate_num":
-                logger.debug(f"Submitter plate id: {value}")
-                field_value = value
-            case "samples":
-                instance = construct_samples(ctx=ctx, instance=instance, samples=value)
-                continue
-            case "submission_type":
-                field_value = lookup_submission_type(ctx=ctx, name=value)            
-            case _:
-                field_value = value
-        # insert into field
-        try:
-            setattr(instance, item, field_value)
-        except AttributeError:
-            logger.debug(f"Could not set attribute: {item} to {info_dict[item]}")
-            continue
-        except KeyError:
-            continue
-    # calculate cost of the run: immutable cost + mutable times number of columns
-    # This is now attached to submission upon creation to preserve at-run costs incase of cost increase in the future.
-    try:
-        logger.debug(f"Calculating costs for procedure...")
-        instance.calculate_base_cost()
-    except (TypeError, AttributeError) as e:
-        logger.debug(f"Looks like that kit doesn't have cost breakdown yet due to: {e}, using full plate cost.")
-        instance.run_cost = instance.extraction_kit.cost_per_run
-    logger.debug(f"Calculated base run cost of: {instance.run_cost}")
-    # Apply any discounts that are applicable for client and kit.
-    try:
-        logger.debug("Checking and applying discounts...")
-        discounts = [item.amount for item in lookup_discounts(ctx=ctx, kit_type=instance.extraction_kit, organization=instance.submitting_lab)]
-        logger.debug(f"We got discounts: {discounts}")
-        if len(discounts) > 0:
-            discounts = sum(discounts)
-            instance.run_cost = instance.run_cost - discounts
-    except Exception as e:
-        logger.error(f"An unknown exception occurred when calculating discounts: {e}")
-    # We need to make sure there's a proper rsl plate number
-    logger.debug(f"We've got a total cost of {instance.run_cost}")
-    try:
-        logger.debug(f"Constructed instance: {instance.to_string()}")
-    except AttributeError as e:
-        logger.debug(f"Something went wrong constructing instance {info_dict['rsl_plate_num']}: {e}")
-    logger.debug(f"Constructed submissions message: {msg}")
-    return instance, {'code':code, 'message':msg}
+#     # if query return nothing, ie doesn't already exist in db
+#     if instance == None:
+#         instance = model()
+#         logger.debug(f"Submission doesn't exist yet, creating new instance: {instance}")
+#         msg = None
+#         code = 0
+#     else:
+#         code = 1
+#         msg = "This submission already exists.\nWould you like to overwrite?"
+#     for item in info_dict:
+#         value = info_dict[item]
+#         logger.debug(f"Setting {item} to {value}")
+#         # set fields based on keys in dictionary
+#         match item:
+#             case "extraction_kit":
+#                 logger.debug(f"Looking up kit {value}")
+#                 field_value = lookup_kit_types(ctx=ctx, name=value)
+#                 logger.debug(f"Got {field_value} for kit {value}")
+#             case "submitting_lab":
+#                 logger.debug(f"Looking up organization: {value}")
+#                 field_value = lookup_organizations(ctx=ctx, name=value)
+#                 logger.debug(f"Got {field_value} for organization {value}")
+#             case "submitter_plate_num":
+#                 logger.debug(f"Submitter plate id: {value}")
+#                 field_value = value
+#             case "samples":
+#                 instance = construct_samples(ctx=ctx, instance=instance, samples=value)
+#                 continue
+#             case "submission_type":
+#                 field_value = lookup_submission_type(ctx=ctx, name=value)            
+#             case _:
+#                 field_value = value
+#         # insert into field
+#         try:
+#             setattr(instance, item, field_value)
+#         except AttributeError:
+#             logger.debug(f"Could not set attribute: {item} to {info_dict[item]}")
+#             continue
+#         except KeyError:
+#             continue
+#     # calculate cost of the run: immutable cost + mutable times number of columns
+#     # This is now attached to submission upon creation to preserve at-run costs incase of cost increase in the future.
+#     try:
+#         logger.debug(f"Calculating costs for procedure...")
+#         instance.calculate_base_cost()
+#     except (TypeError, AttributeError) as e:
+#         logger.debug(f"Looks like that kit doesn't have cost breakdown yet due to: {e}, using full plate cost.")
+#         instance.run_cost = instance.extraction_kit.cost_per_run
+#     logger.debug(f"Calculated base run cost of: {instance.run_cost}")
+#     # Apply any discounts that are applicable for client and kit.
+#     try:
+#         logger.debug("Checking and applying discounts...")
+#         discounts = [item.amount for item in lookup_discounts(ctx=ctx, kit_type=instance.extraction_kit, organization=instance.submitting_lab)]
+#         logger.debug(f"We got discounts: {discounts}")
+#         if len(discounts) > 0:
+#             discounts = sum(discounts)
+#             instance.run_cost = instance.run_cost - discounts
+#     except Exception as e:
+#         logger.error(f"An unknown exception occurred when calculating discounts: {e}")
+#     # We need to make sure there's a proper rsl plate number
+#     logger.debug(f"We've got a total cost of {instance.run_cost}")
+#     try:
+#         logger.debug(f"Constructed instance: {instance.to_string()}")
+#     except AttributeError as e:
+#         logger.debug(f"Something went wrong constructing instance {info_dict['rsl_plate_num']}: {e}")
+#     logger.debug(f"Constructed submissions message: {msg}")
+#     return instance, {'code':code, 'message':msg}
 
-def construct_samples(ctx:Settings, instance:models.BasicSubmission, samples:List[dict]) -> models.BasicSubmission:
-    """
-    constructs sample objects and adds to submission
+# def construct_samples(ctx:Settings, instance:models.BasicSubmission, samples:List[dict]) -> models.BasicSubmission:
+#     """
+#     constructs sample objects and adds to submission
+#     NOTE: Depreciated in favour of Pydantic model .toSQL method
 
-    Args:
-        ctx (Settings): settings passed down from gui
-        instance (models.BasicSubmission): Submission samples scraped from.
-        samples (List[dict]): List of parsed samples
+#     Args:
+#         ctx (Settings): settings passed down from gui
+#         instance (models.BasicSubmission): Submission samples scraped from.
+#         samples (List[dict]): List of parsed samples
 
-    Returns:
-        models.BasicSubmission: Updated submission object.
-    """    
-    for sample in samples:
-        sample_instance = lookup_samples(ctx=ctx, submitter_id=str(sample['sample'].submitter_id))
-        if sample_instance == None:
-            sample_instance = sample['sample']
-        else:
-            logger.warning(f"Sample {sample} already exists, creating association.")
-        logger.debug(f"Adding {sample_instance.__dict__}")
-        if sample_instance in instance.samples:
-            logger.error(f"Looks like there's a duplicate sample on this plate: {sample_instance.submitter_id}!")
-            continue
-        try:
-            with ctx.database_session.no_autoflush:
-                try:
-                    sample_query = sample_instance.sample_type.replace('Sample', '').strip()
-                    logger.debug(f"Here is the sample instance type: {sample_instance}")
-                    try:
-                        assoc = getattr(models, f"{sample_query}Association")
-                    except AttributeError as e:
-                        logger.error(f"Couldn't get type specific association using {sample_instance.sample_type.replace('Sample', '').strip()}. Getting generic.")
-                        assoc = models.SubmissionSampleAssociation
-                    assoc = assoc(submission=instance, sample=sample_instance, row=sample['row'], column=sample['column'])
-                    instance.submission_sample_associations.append(assoc)
-                except IntegrityError:
-                    logger.error(f"Hit integrity error for: {sample}")
-                    continue
-                except SAWarning:
-                    logger.error(f"Looks like the association already exists for submission: {instance} and sample: {sample_instance}")
-                    continue
-        except IntegrityError as e:
-            logger.critical(e)
-            continue
-    return instance
+#     Returns:
+#         models.BasicSubmission: Updated submission object.
+#     """    
+#     for sample in samples:
+#         sample_instance = lookup_samples(ctx=ctx, submitter_id=str(sample['sample'].submitter_id))
+#         if sample_instance == None:
+#             sample_instance = sample['sample']
+#         else:
+#             logger.warning(f"Sample {sample} already exists, creating association.")
+#         logger.debug(f"Adding {sample_instance.__dict__}")
+#         if sample_instance in instance.samples:
+#             logger.error(f"Looks like there's a duplicate sample on this plate: {sample_instance.submitter_id}!")
+#             continue
+#         try:
+#             with ctx.database_session.no_autoflush:
+#                 try:
+#                     sample_query = sample_instance.sample_type.replace('Sample', '').strip()
+#                     logger.debug(f"Here is the sample instance type: {sample_instance}")
+#                     try:
+#                         assoc = getattr(models, f"{sample_query}Association")
+#                     except AttributeError as e:
+#                         logger.error(f"Couldn't get type specific association using {sample_instance.sample_type.replace('Sample', '').strip()}. Getting generic.")
+#                         assoc = models.SubmissionSampleAssociation
+#                     assoc = assoc(submission=instance, sample=sample_instance, row=sample['row'], column=sample['column'])
+#                     instance.submission_sample_associations.append(assoc)
+#                 except IntegrityError:
+#                     logger.error(f"Hit integrity error for: {sample}")
+#                     continue
+#                 except SAWarning:
+#                     logger.error(f"Looks like the association already exists for submission: {instance} and sample: {sample_instance}")
+#                     continue
+#         except IntegrityError as e:
+#             logger.critical(e)
+#             continue
+#     return instance
 
-@check_authorization
-def construct_kit_from_yaml(ctx:Settings, kit_dict:dict) -> dict:
-    """
-    Create and store a new kit in the database based on a .yml file
-    TODO: split into create and store functions
+# @check_authorization
+# def construct_kit_from_yaml(ctx:Settings, kit_dict:dict) -> dict:
+#     """
+#     Create and store a new kit in the database based on a .yml file
+#     TODO: split into create and store functions
 
-    Args:
-        ctx (Settings): Context object passed down from frontend
-        kit_dict (dict): Experiment dictionary created from yaml file
+#     Args:
+#         ctx (Settings): Context object passed down from frontend
+#         kit_dict (dict): Experiment dictionary created from yaml file
 
-    Returns:
-        dict: a dictionary containing results of db addition
-    """    
-    # from tools import check_is_power_user, massage_common_reagents
-    # Don't want just anyone adding kits
-    # if not check_is_power_user(ctx=ctx):
-    #     logger.debug(f"{getuser()} does not have permission to add kits.")
-    #     return {'code':1, 'message':"This user does not have permission to add kits.", "status":"warning"}
-    submission_type = lookup_submission_type(ctx=ctx, name=kit_dict['used_for'])
-    logger.debug(f"Looked up submission type: {kit_dict['used_for']} and got {submission_type}")
-    kit = models.KitType(name=kit_dict["kit_name"])
-    kt_st_assoc = models.SubmissionTypeKitTypeAssociation(kit_type=kit, submission_type=submission_type)
-    for k,v in kit_dict.items():
-        if k not in ["reagent_types", "kit_name", "used_for"]:
-            kt_st_assoc.set_attrib(k, v)
-    kit.kit_submissiontype_associations.append(kt_st_assoc)
-    # A kit contains multiple reagent types.
-    for r in kit_dict['reagent_types']:
-        logger.debug(f"Constructing reagent type: {r}")
-        rtname = massage_common_reagents(r['rtname'])
-        look_up = lookup_reagent_types(name=rtname)
-        if look_up == None:
-            rt = models.ReagentType(name=rtname.strip(), eol_ext=timedelta(30*r['eol']))
-        else:
-            rt = look_up
-        uses = {kit_dict['used_for']:{k:v for k,v in r.items() if k not in ['eol']}}
-        assoc = models.KitTypeReagentTypeAssociation(kit_type=kit, reagent_type=rt, uses=uses)
-        # ctx.database_session.add(rt)
-        store_object(ctx=ctx, object=rt)
-        kit.kit_reagenttype_associations.append(assoc)
-        logger.debug(f"Kit construction reagent type: {rt.__dict__}")
-    logger.debug(f"Kit construction kit: {kit.__dict__}")
-    store_object(ctx=ctx, object=kit)
-    return {'code':0, 'message':'Kit has been added', 'status': 'information'}
+#     Returns:
+#         dict: a dictionary containing results of db addition
+#     """    
+#     # from tools import check_is_power_user, massage_common_reagents
+#     # Don't want just anyone adding kits
+#     # if not check_is_power_user(ctx=ctx):
+#     #     logger.debug(f"{getuser()} does not have permission to add kits.")
+#     #     return {'code':1, 'message':"This user does not have permission to add kits.", "status":"warning"}
+#     submission_type = lookup_submission_type(ctx=ctx, name=kit_dict['used_for'])
+#     logger.debug(f"Looked up submission type: {kit_dict['used_for']} and got {submission_type}")
+#     kit = models.KitType(name=kit_dict["kit_name"])
+#     kt_st_assoc = models.SubmissionTypeKitTypeAssociation(kit_type=kit, submission_type=submission_type)
+#     for k,v in kit_dict.items():
+#         if k not in ["reagent_types", "kit_name", "used_for"]:
+#             kt_st_assoc.set_attrib(k, v)
+#     kit.kit_submissiontype_associations.append(kt_st_assoc)
+#     # A kit contains multiple reagent types.
+#     for r in kit_dict['reagent_types']:
+#         logger.debug(f"Constructing reagent type: {r}")
+#         rtname = massage_common_reagents(r['rtname'])
+#         look_up = lookup_reagent_types(name=rtname)
+#         if look_up == None:
+#             rt = models.ReagentType(name=rtname.strip(), eol_ext=timedelta(30*r['eol']))
+#         else:
+#             rt = look_up
+#         uses = {kit_dict['used_for']:{k:v for k,v in r.items() if k not in ['eol']}}
+#         assoc = models.KitTypeReagentTypeAssociation(kit_type=kit, reagent_type=rt, uses=uses)
+#         # ctx.database_session.add(rt)
+#         store_object(ctx=ctx, object=rt)
+#         kit.kit_reagenttype_associations.append(assoc)
+#         logger.debug(f"Kit construction reagent type: {rt.__dict__}")
+#     logger.debug(f"Kit construction kit: {kit.__dict__}")
+#     store_object(ctx=ctx, object=kit)
+#     return {'code':0, 'message':'Kit has been added', 'status': 'information'}
 
-@check_authorization
-def construct_org_from_yaml(ctx:Settings, org:dict) -> dict:
-    """
-    Create and store a new organization based on a .yml file
+# @check_authorization
+# def construct_org_from_yaml(ctx:Settings, org:dict) -> dict:
+#     """
+#     Create and store a new organization based on a .yml file
 
-    Args:
-        ctx (Settings): Context object passed down from frontend
-        org (dict): Dictionary containing organization info.
+#     Args:
+#         ctx (Settings): Context object passed down from frontend
+#         org (dict): Dictionary containing organization info.
 
-    Returns:
-        dict: dictionary containing results of db addition
-    """    
-    # from tools import check_is_power_user
-    # # Don't want just anyone adding in clients
-    # if not check_is_power_user(ctx=ctx):
-    #     logger.debug(f"{getuser()} does not have permission to add kits.")
-    #     return {'code':1, 'message':"This user does not have permission to add organizations."}
-    # the yml can contain multiple clients
-    for client in org:
-        cli_org = models.Organization(name=client.replace(" ", "_").lower(), cost_centre=org[client]['cost centre'])
-        # a client can contain multiple contacts
-        for contact in org[client]['contacts']:
-            cont_name = list(contact.keys())[0]
-            # check if contact already exists
-            look_up = ctx.database_session.query(models.Contact).filter(models.Contact.name==cont_name).first()
-            if look_up == None:
-                cli_cont = models.Contact(name=cont_name, phone=contact[cont_name]['phone'], email=contact[cont_name]['email'], organization=[cli_org])
-            else:
-                cli_cont = look_up
-                cli_cont.organization.append(cli_org)
-            ctx.database_session.add(cli_cont)
-            logger.debug(f"Client creation contact: {cli_cont.__dict__}")
-        logger.debug(f"Client creation client: {cli_org.__dict__}")
-        ctx.database_session.add(cli_org)
-    ctx.database_session.commit()
-    return {"code":0, "message":"Organization has been added."}
+#     Returns:
+#         dict: dictionary containing results of db addition
+#     """    
+#     # from tools import check_is_power_user
+#     # # Don't want just anyone adding in clients
+#     # if not check_is_power_user(ctx=ctx):
+#     #     logger.debug(f"{getuser()} does not have permission to add kits.")
+#     #     return {'code':1, 'message':"This user does not have permission to add organizations."}
+#     # the yml can contain multiple clients
+#     for client in org:
+#         cli_org = models.Organization(name=client.replace(" ", "_").lower(), cost_centre=org[client]['cost centre'])
+#         # a client can contain multiple contacts
+#         for contact in org[client]['contacts']:
+#             cont_name = list(contact.keys())[0]
+#             # check if contact already exists
+#             look_up = ctx.database_session.query(models.Contact).filter(models.Contact.name==cont_name).first()
+#             if look_up == None:
+#                 cli_cont = models.Contact(name=cont_name, phone=contact[cont_name]['phone'], email=contact[cont_name]['email'], organization=[cli_org])
+#             else:
+#                 cli_cont = look_up
+#                 cli_cont.organization.append(cli_org)
+#             ctx.database_session.add(cli_cont)
+#             logger.debug(f"Client creation contact: {cli_cont.__dict__}")
+#         logger.debug(f"Client creation client: {cli_org.__dict__}")
+#         ctx.database_session.add(cli_org)
+#     ctx.database_session.commit()
+#     return {"code":0, "message":"Organization has been added."}
 
diff --git a/src/submissions/backend/db/functions/lookups.py b/src/submissions/backend/db/functions/lookups.py
index 2290f27..b178193 100644
--- a/src/submissions/backend/db/functions/lookups.py
+++ b/src/submissions/backend/db/functions/lookups.py
@@ -135,7 +135,13 @@ def lookup_reagent_types(ctx:Settings,
                 reagent = lookup_reagents(ctx=ctx, lot_number=reagent)
             case _:
                 pass
-        return list(set(kit_type.reagent_types).intersection(reagent.type))[0]
+        assert reagent.type != []
+        logger.debug(f"Looking up reagent type for {type(kit_type)} {kit_type} and {type(reagent)} {reagent}")
+        logger.debug(f"Kit reagent types: {kit_type.reagent_types}")
+        logger.debug(f"Reagent reagent types: {reagent._sa_instance_state}")
+        result = list(set(kit_type.reagent_types).intersection(reagent.type))
+        logger.debug(f"Result: {result}")
+        return result[0]
     match name:
         case str():
             logger.debug(f"Looking up reagent type by name: {name}")
@@ -420,6 +426,8 @@ def lookup_reagenttype_kittype_association(ctx:Settings,
 def lookup_submission_sample_association(ctx:Settings,
                                          submission:models.BasicSubmission|str|None=None,
                                          sample:models.BasicSample|str|None=None,
+                                         row:int=0,
+                                         column:int=0,
                                          limit:int=0,
                                          chronologic:bool=False
                                          ) -> models.SubmissionSampleAssociation|List[models.SubmissionSampleAssociation]:
@@ -438,10 +446,14 @@ def lookup_submission_sample_association(ctx:Settings,
             query = query.join(models.BasicSample).filter(models.BasicSample.submitter_id==sample)
         case _:
             pass
+    if row > 0:
+        query = query.filter(models.SubmissionSampleAssociation.row==row)
+    if column > 0:
+        query = query.filter(models.SubmissionSampleAssociation.column==column)
     logger.debug(f"Query count: {query.count()}")
     if chronologic:
         query.join(models.BasicSubmission).order_by(models.BasicSubmission.submitted_date)
-    if query.count() == 1:
+    if query.count() <= 1:
         limit = 1
     return query_return(query=query, limit=limit)
 
diff --git a/src/submissions/backend/db/functions/misc.py b/src/submissions/backend/db/functions/misc.py
index ac0082f..1bae27f 100644
--- a/src/submissions/backend/db/functions/misc.py
+++ b/src/submissions/backend/db/functions/misc.py
@@ -100,6 +100,7 @@ def update_last_used(ctx:Settings, reagent:models.Reagent, kit:models.KitType):
         kit (models.KitType): kit to be used for lookup
     """    
     # rt = list(set(reagent.type).intersection(kit.reagent_types))[0]
+    logger.debug(f"Attempting update of reagent type at intersection of ({reagent}), ({kit})")
     rt = lookup_reagent_types(ctx=ctx, kit_type=kit, reagent=reagent)
     if rt != None:
         assoc = lookup_reagenttype_kittype_association(ctx=ctx, kit_type=kit, reagent_type=rt)
diff --git a/src/submissions/backend/db/models/__init__.py b/src/submissions/backend/db/models/__init__.py
index 3dd7936..3ad4a23 100644
--- a/src/submissions/backend/db/models/__init__.py
+++ b/src/submissions/backend/db/models/__init__.py
@@ -1,43 +1,42 @@
 '''
 Contains all models for sqlalchemy
 '''
-from typing import Any
 from sqlalchemy.orm import declarative_base, DeclarativeMeta
 import logging
-from pprint import pformat
 
 Base: DeclarativeMeta = declarative_base()
 metadata = Base.metadata
 
 logger = logging.getLogger(f"submissions.{__name__}")
 
-def find_subclasses(parent:Any, attrs:dict|None=None, rsl_number:str|None=None) -> Any:
-    """
-    Finds subclasses of a parent that does contain all 
-    attributes if the parent does not.
+# def find_subclasses(parent:Any, attrs:dict|None=None, rsl_number:str|None=None) -> Any:
+#     """
+#     Finds subclasses of a parent that does contain all 
+#     attributes if the parent does not.
+#     NOTE: Depreciated, moved to classmethods in individual base models.
 
-    Args:
-        parent (_type_): Parent class.
-        attrs (dict): Key:Value dictionary of attributes
+#     Args:
+#         parent (_type_): Parent class.
+#         attrs (dict): Key:Value dictionary of attributes
 
-    Raises:
-        AttributeError: Raised if no subclass is found.
+#     Raises:
+#         AttributeError: Raised if no subclass is found.
 
-    Returns:
-        _type_: Parent or subclass.
-    """    
-    if len(attrs) == 0 or attrs == None:
-        return parent
-    if any([not hasattr(parent, attr) for attr in attrs]):
-        # looks for first model that has all included kwargs
-        try:
-            model = [subclass for subclass in parent.__subclasses__() if all([hasattr(subclass, attr) for attr in attrs])][0]
-        except IndexError as e:
-            raise AttributeError(f"Couldn't find existing class/subclass of {parent} with all attributes:\n{pformat(attrs)}")
-    else:
-        model = parent
-    logger.debug(f"Using model: {model}")
-    return model
+#     Returns:
+#         _type_: Parent or subclass.
+#     """    
+#     if len(attrs) == 0 or attrs == None:
+#         return parent
+#     if any([not hasattr(parent, attr) for attr in attrs]):
+#         # looks for first model that has all included kwargs
+#         try:
+#             model = [subclass for subclass in parent.__subclasses__() if all([hasattr(subclass, attr) for attr in attrs])][0]
+#         except IndexError as e:
+#             raise AttributeError(f"Couldn't find existing class/subclass of {parent} with all attributes:\n{pformat(attrs)}")
+#     else:
+#         model = parent
+#     logger.debug(f"Using model: {model}")
+#     return model
 
 from .controls import Control, ControlType
 from .kits import KitType, ReagentType, Reagent, Discount, KitTypeReagentTypeAssociation, SubmissionType, SubmissionTypeKitTypeAssociation
diff --git a/src/submissions/backend/db/models/kits.py b/src/submissions/backend/db/models/kits.py
index 532923d..55e0214 100644
--- a/src/submissions/backend/db/models/kits.py
+++ b/src/submissions/backend/db/models/kits.py
@@ -31,7 +31,8 @@ class KitType(Base):
 
     # association proxy of "user_keyword_associations" collection
     # to "keyword" attribute
-    reagent_types = association_proxy("kit_reagenttype_associations", "reagent_type")
+    # creator function: https://stackoverflow.com/questions/11091491/keyerror-when-adding-objects-to-sqlalchemy-association-object/11116291#11116291
+    reagent_types = association_proxy("kit_reagenttype_associations", "reagent_type", creator=lambda RT: KitTypeReagentTypeAssociation(reagent_type=RT))
 
     kit_submissiontype_associations = relationship(
         "SubmissionTypeKitTypeAssociation",
@@ -118,7 +119,8 @@ class ReagentType(Base):
 
     # association proxy of "user_keyword_associations" collection
     # to "keyword" attribute
-    kit_types = association_proxy("reagenttype_kit_associations", "kit_type")
+    # creator function: https://stackoverflow.com/questions/11091491/keyerror-when-adding-objects-to-sqlalchemy-association-object/11116291#11116291
+    kit_types = association_proxy("reagenttype_kit_associations", "kit_type", creator=lambda kit: KitTypeReagentTypeAssociation(kit_type=kit))
 
     def __str__(self) -> str:
         """
@@ -150,6 +152,7 @@ class KitTypeReagentTypeAssociation(Base):
     reagent_type = relationship(ReagentType, back_populates="reagenttype_kit_associations")
 
     def __init__(self, kit_type=None, reagent_type=None, uses=None, required=1):
+        logger.debug(f"Parameters: Kit={kit_type}, RT={reagent_type}, Uses={uses}, Required={required}")
         self.kit_type = kit_type
         self.reagent_type = reagent_type
         self.uses = uses
@@ -186,9 +189,9 @@ class Reagent(Base):
 
     def __repr__(self):
         if self.name != None:
-            return f"Reagent({self.name}-{self.lot})"
+            return f"<Reagent({self.name}-{self.lot})>"
         else:
-            return f"Reagent({self.type.name}-{self.lot})"
+            return f"<Reagent({self.type.name}-{self.lot})>"
         
 
     def __str__(self) -> str:
diff --git a/src/submissions/backend/db/models/organizations.py b/src/submissions/backend/db/models/organizations.py
index 41278e5..e1baa1b 100644
--- a/src/submissions/backend/db/models/organizations.py
+++ b/src/submissions/backend/db/models/organizations.py
@@ -32,6 +32,13 @@ class Organization(Base):
     
     def __repr__(self) -> str:
         return f"<Organization({self.name})>"
+    
+    def save(self, ctx):
+        ctx.database_session.add(self)
+        ctx.database_session.commit()
+
+    def set_attribute(self, name:str, value):
+        setattr(self, name, value)
 
 
 class Contact(Base):
diff --git a/src/submissions/backend/db/models/submissions.py b/src/submissions/backend/db/models/submissions.py
index 8daca00..cb7e0e7 100644
--- a/src/submissions/backend/db/models/submissions.py
+++ b/src/submissions/backend/db/models/submissions.py
@@ -13,7 +13,6 @@ from json.decoder import JSONDecodeError
 from math import ceil
 from sqlalchemy.ext.associationproxy import association_proxy
 import uuid
-from pandas import Timestamp
 from dateutil.parser import parse
 import re
 import pandas as pd
@@ -301,6 +300,7 @@ class BasicSubmission(Base):
     @classmethod
     def enforce_name(cls, ctx:Settings, instr:str) -> str:
         logger.debug(f"Hello from {cls.__mapper_args__['polymorphic_identity']} Enforcer!")
+        logger.debug(f"Attempting enforcement on {instr}")
         return instr
 
     @classmethod
@@ -344,6 +344,11 @@ class BasicSubmission(Base):
         logger.debug(f"Hello from {cls.__mapper_args__['polymorphic_identity']} PCR parser!")
         return []
 
+    def save(self, ctx:Settings):
+        self.uploaded_by = getuser()
+        ctx.database_session.add(self)
+        ctx.database_session.commit()
+
 # Below are the custom submission types
 
 class BacterialCulture(BasicSubmission):
@@ -536,6 +541,8 @@ class Wastewater(BasicSubmission):
         def construct():
             today = datetime.now()
             return f"RSL-WW-{today.year}{str(today.month).zfill(2)}{str(today.day).zfill(2)}"
+        if outstr == None:
+            outstr = construct()
         try:
             outstr = re.sub(r"PCR(-|_)", "", outstr)
         except AttributeError as e:
@@ -743,6 +750,11 @@ class BasicSample(Base):
                 logger.error(f"Could not get polymorph {polymorphic_identity} of {cls} due to {e}")
                 return cls
 
+    @classmethod
+    def parse_sample(cls, input_dict:dict) -> dict:
+        logger.debug(f"Called {cls.__name__} sample parser")
+        return input_dict
+
 class WastewaterSample(BasicSample):
     """
     Derivative wastewater sample
@@ -757,51 +769,51 @@ class WastewaterSample(BasicSample):
     __mapper_args__ = {"polymorphic_identity": "Wastewater Sample", "polymorphic_load": "inline"}
 
         
-    @validates("collected-date")
-    def convert_cdate_time(self, key, value):
-        logger.debug(f"Validating {key}: {value}")
-        if isinstance(value, Timestamp):
-            return value.date()
-        if isinstance(value, str):
-            return parse(value)
-        return value
+    # @validates("collected-date")
+    # def convert_cdate_time(self, key, value):
+    #     logger.debug(f"Validating {key}: {value}")
+    #     if isinstance(value, Timestamp):
+    #         return value.date()
+    #     if isinstance(value, str):
+    #         return parse(value)
+    #     return value
     
-    @validates("rsl_number")
-    def use_submitter_id(self, key, value):
-        logger.debug(f"Validating {key}: {value}")
-        return value or self.submitter_id
+    # @validates("rsl_number")
+    # def use_submitter_id(self, key, value):
+    #     logger.debug(f"Validating {key}: {value}")
+    #     return value or self.submitter_id
 
-    def set_attribute(self, name:str, value):
-        """
-        Set an attribute of this object. Extends parent.
+    # def set_attribute(self, name:str, value):
+    #     """
+    #     Set an attribute of this object. Extends parent.
 
-        Args:
-            name (str): name of the attribute
-            value (_type_): value to be set
-        """        
-        # Due to the plate map being populated with RSL numbers, we have to do some shuffling. 
-        match name:
-            case "submitter_id":
-                # If submitter_id already has a value, stop
-                if self.submitter_id != None:
-                    return
-                # otherwise also set rsl_number to the same value
-                else:
-                    super().set_attribute("rsl_number", value)
-            case "ww_full_sample_id":
-                # If value present, set ww_full_sample_id and make this the submitter_id
-                if value != None:
-                    super().set_attribute(name, value)
-                    name = "submitter_id"
-            case 'collection_date':
-                # If this is a string use dateutils to parse into date()
-                if isinstance(value, str):
-                    logger.debug(f"collection_date {value} is a string. Attempting parse...")
-                    value = parse(value)
-            case "rsl_number":
-                if value == None:
-                    value = self.submitter_id
-        super().set_attribute(name, value)
+    #     Args:
+    #         name (str): name of the attribute
+    #         value (_type_): value to be set
+    #     """        
+    #     # Due to the plate map being populated with RSL numbers, we have to do some shuffling. 
+    #     match name:
+    #         case "submitter_id":
+    #             # If submitter_id already has a value, stop
+    #             if self.submitter_id != None:
+    #                 return
+    #             # otherwise also set rsl_number to the same value
+    #             else:
+    #                 super().set_attribute("rsl_number", value)
+    #         case "ww_full_sample_id":
+    #             # If value present, set ww_full_sample_id and make this the submitter_id
+    #             if value != None:
+    #                 super().set_attribute(name, value)
+    #                 name = "submitter_id"
+    #         case 'collection_date':
+    #             # If this is a string use dateutils to parse into date()
+    #             if isinstance(value, str):
+    #                 logger.debug(f"collection_date {value} is a string. Attempting parse...")
+    #                 value = parse(value)
+    #         case "rsl_number":
+    #             if value == None:
+    #                 value = self.submitter_id
+    #     super().set_attribute(name, value)
 
     def to_hitpick(self, submission_rsl:str) -> dict|None:
         """
@@ -832,6 +844,16 @@ class WastewaterSample(BasicSample):
         except IndexError:
             return None
             
+    @classmethod
+    def parse_sample(cls, input_dict: dict) -> dict:
+        output_dict = super().parse_sample(input_dict)
+        if output_dict['rsl_number'] == None:
+            output_dict['rsl_number'] = output_dict['submitter_id']
+        if output_dict['ww_full_sample_id'] != None:
+            output_dict["submitter_id"] = output_dict['ww_full_sample_id']
+        return output_dict
+
+
 class BacterialCultureSample(BasicSample):
     """
     base of bacterial culture sample
@@ -873,7 +895,7 @@ class SubmissionSampleAssociation(Base):
     # Refers to the type of parent.
     # Hooooooo boy, polymorphic association type, now we're getting into the weeds!
     __mapper_args__ = {
-        "polymorphic_identity": "basic_association",
+        "polymorphic_identity": "Basic Association",
         "polymorphic_on": base_sub_type,
         "with_polymorphic": "*",
     }
@@ -886,6 +908,19 @@ class SubmissionSampleAssociation(Base):
 
     def __repr__(self) -> str:
         return f"<SubmissionSampleAssociation({self.submission.rsl_plate_num} & {self.sample.submitter_id})"
+    
+    @classmethod
+    def find_polymorphic_subclass(cls, polymorphic_identity:str|None=None):   
+        if isinstance(polymorphic_identity, dict):
+            polymorphic_identity = polymorphic_identity['value']
+        if polymorphic_identity == None:
+            return cls
+        else:
+            try:
+                return [item for item in cls.__subclasses__() if item.__mapper_args__['polymorphic_identity']==polymorphic_identity][0]
+            except Exception as e:
+                logger.error(f"Could not get polymorph {polymorphic_identity} of {cls} due to {e}")
+                return cls
 
 class WastewaterAssociation(SubmissionSampleAssociation):
     """
@@ -897,5 +932,5 @@ class WastewaterAssociation(SubmissionSampleAssociation):
     n2_status = Column(String(32)) #: positive or negative for N2
     pcr_results = Column(JSON) #: imported PCR status from QuantStudio
 
-    __mapper_args__ = {"polymorphic_identity": "wastewater", "polymorphic_load": "inline"}
+    __mapper_args__ = {"polymorphic_identity": "Wastewater Association", "polymorphic_load": "inline"}
 
diff --git a/src/submissions/backend/excel/parser.py b/src/submissions/backend/excel/parser.py
index 1f8702a..1a108d1 100644
--- a/src/submissions/backend/excel/parser.py
+++ b/src/submissions/backend/excel/parser.py
@@ -5,9 +5,10 @@ from getpass import getuser
 import pprint
 from typing import List
 import pandas as pd
+import numpy as np
 from pathlib import Path
 from backend.db import models, lookup_kit_types, lookup_submission_type, lookup_samples
-from backend.validators import PydSheetSubmission, PydSheetReagent, RSLNamer
+from backend.validators import PydSubmission, PydReagent, RSLNamer, PydSample
 import logging
 from collections import OrderedDict
 import re
@@ -113,7 +114,7 @@ class SheetParser(object):
         logger.debug(f"List of reagents for comparison with allowed_reagents: {pprint.pformat(self.sub['reagents'])}")
         self.sub['reagents'] = [reagent for reagent in self.sub['reagents'] if reagent['value'].type in allowed_reagents]
         
-    def to_pydantic(self) -> PydSheetSubmission:
+    def to_pydantic(self) -> PydSubmission:
         """
         Generates a pydantic model of scraped data for validation
 
@@ -121,8 +122,8 @@ class SheetParser(object):
             PydSubmission: output pydantic model
         """       
         logger.debug(f"Submission dictionary coming into 'to_pydantic':\n{pprint.pformat(self.sub)}")
-        psm = PydSheetSubmission(ctx=self.ctx, filepath=self.filepath, **self.sub)
-        delattr(psm, "filepath")
+        psm = PydSubmission(ctx=self.ctx, filepath=self.filepath, **self.sub)
+        # delattr(psm, "filepath")
         return psm
     
 class InfoParser(object):
@@ -218,6 +219,7 @@ class ReagentParser(object):
         listo = []
         for sheet in self.xl.sheet_names:
             df = self.xl.parse(sheet, header=None, dtype=object)
+            df.replace({np.nan: None}, inplace = True)
             relevant = {k.strip():v for k,v in self.map.items() if sheet in self.map[k]['sheet']}
             logger.debug(f"relevant map for {sheet}: {pprint.pformat(relevant)}")
             if relevant == {}:
@@ -229,15 +231,16 @@ class ReagentParser(object):
                     lot = df.iat[relevant[item]['lot']['row']-1, relevant[item]['lot']['column']-1]
                     expiry = df.iat[relevant[item]['expiry']['row']-1, relevant[item]['expiry']['column']-1]
                 except (KeyError, IndexError):
-                    listo.append(dict(value=PydSheetReagent(type=item.strip(), lot=None, exp=None, name=None), parsed=False))
+                    listo.append(dict(value=PydReagent(ctx=self.ctx, type=item.strip(), lot=None, exp=None, name=None), parsed=False))
                     continue
                 if check_not_nan(lot):
                     parsed = True
                 else:
                     parsed = False
-                logger.debug(f"Got lot for {item}-{name}: {lot} as {type(lot)}")
+                # logger.debug(f"Got lot for {item}-{name}: {lot} as {type(lot)}")
                 lot = str(lot)
-                listo.append(dict(value=PydSheetReagent(type=item.strip(), lot=lot, exp=expiry, name=name), parsed=parsed))
+                logger.debug(f"Going into pydantic: name: {name}, lot: {lot}, expiry: {expiry}, type: {item.strip()}")
+                listo.append(dict(value=PydReagent(ctx=self.ctx, type=item.strip(), lot=lot, exp=expiry, name=name), parsed=parsed))
         logger.debug(f"Returning listo: {listo}")
         return listo
 
@@ -284,7 +287,8 @@ class SampleParser(object):
         logger.debug(f"info_map: {pprint.pformat(submission_type.info_map)}")
         sample_info_map = submission_type.info_map['samples']
         # self.custom_parser = get_polymorphic_subclass(models.BasicSubmission, submission_type.name).parse_samples
-        self.custom_parser = models.BasicSubmission.find_polymorphic_subclass(polymorphic_identity=submission_type.name).parse_samples
+        self.custom_sub_parser = models.BasicSubmission.find_polymorphic_subclass(polymorphic_identity=submission_type.name).parse_samples
+        self.custom_sample_parser = models.BasicSample.find_polymorphic_subclass(polymorphic_identity=f"{submission_type.name} Sample").parse_sample
         return sample_info_map
 
     def construct_plate_map(self, plate_map_location:dict) -> pd.DataFrame:
@@ -361,9 +365,13 @@ class SampleParser(object):
             else:
                 return input_str
         for sample in self.samples:
-            addition = self.lookup_table[self.lookup_table.isin([sample['submitter_id']]).any(axis=1)].squeeze().to_dict()
-            logger.debug(f"Lookuptable info: {addition}")
-            for k,v in addition.items():
+            # addition = self.lookup_table[self.lookup_table.isin([sample['submitter_id']]).any(axis=1)].squeeze().to_dict()
+            addition = self.lookup_table[self.lookup_table.isin([sample['submitter_id']]).any(axis=1)].squeeze()
+            logger.debug(addition)
+            if isinstance(addition, pd.DataFrame) and not addition.empty:
+                addition = addition.iloc[0]
+            logger.debug(f"Lookuptable info: {addition.to_dict()}")
+            for k,v in addition.to_dict().items():
                 # logger.debug(f"Checking {k} in lookup table.")
                 if check_not_nan(k) and isinstance(k, str):
                     if k.lower() not in sample:
@@ -376,7 +384,13 @@ class SampleParser(object):
                                 sample[k] = determine_if_date(v)
                             case _:
                                 sample[k] = v
+            # Set row in lookup table to blank values to prevent multipe lookups.
+            try:
+                self.lookup_table.loc[self.lookup_table['Sample #']==addition['Sample #']] = np.nan
+            except ValueError:
+                pass
             logger.debug(f"Output sample dict: {sample}")
+        logger.debug(f"Final lookup_table: \n\n {self.lookup_table}")
 
     def parse_samples(self, generate:bool=True) -> List[dict]|List[models.BasicSample]:
         """
@@ -391,11 +405,11 @@ class SampleParser(object):
         result = None
         new_samples = []
         for ii, sample in enumerate(self.samples):
-            try:
-                if sample['submitter_id'] in [check_sample['sample'].submitter_id for check_sample in new_samples]:
-                    sample['submitter_id'] = f"{sample['submitter_id']}-{ii}"
-            except KeyError as e:
-                logger.error(f"Sample obj: {sample}, error: {e}")
+            # try:
+            #     if sample['submitter_id'] in [check_sample['sample'].submitter_id for check_sample in new_samples]:
+            #         sample['submitter_id'] = f"{sample['submitter_id']}-{ii}"
+            # except KeyError as e:
+            #     logger.error(f"Sample obj: {sample}, error: {e}")
             translated_dict = {}
             for k, v in sample.items():
                 match v:
@@ -410,11 +424,14 @@ class SampleParser(object):
                 except KeyError:
                     translated_dict[k] = convert_nans_to_nones(v)
             translated_dict['sample_type'] = f"{self.submission_type} Sample"
-            translated_dict = self.custom_parser(translated_dict)
-            if generate:
-                new_samples.append(self.generate_sample_object(translated_dict))
-            else:
-                new_samples.append(translated_dict)
+            translated_dict = self.custom_sub_parser(translated_dict)
+            translated_dict = self.custom_sample_parser(translated_dict)
+            logger.debug(f"Here is the output of the custom parser: \n\n{translated_dict}\n\n")
+            # if generate:
+            #     new_samples.append(self.generate_sample_object(translated_dict))
+            # else:
+            #     new_samples.append(translated_dict)
+            new_samples.append(PydSample(**translated_dict))
         return result, new_samples
 
     def generate_sample_object(self, input_dict) -> models.BasicSample:
diff --git a/src/submissions/backend/validators/pydant.py b/src/submissions/backend/validators/pydant.py
index 18cdd65..a6b37ab 100644
--- a/src/submissions/backend/validators/pydant.py
+++ b/src/submissions/backend/validators/pydant.py
@@ -3,22 +3,28 @@ Contains pydantic models and accompanying validators
 '''
 import uuid
 from pydantic import BaseModel, field_validator, Field
-from datetime import date, datetime
+from datetime import date, datetime, timedelta
 from dateutil.parser import parse
 from dateutil.parser._parser import ParserError
-from typing import List, Any
+from typing import List, Any, Tuple
 from . import RSLNamer
 from pathlib import Path
 import re
 import logging
 from tools import check_not_nan, convert_nans_to_nones, Settings
-from backend.db.functions import lookup_submissions
+from backend.db.functions import (lookup_submissions, lookup_reagent_types, lookup_reagents, lookup_kit_types, 
+    lookup_organizations, lookup_submission_type, lookup_discounts, lookup_samples, lookup_submission_sample_association,
+    lookup_reagenttype_kittype_association
+)
+from backend.db.models import *
+from sqlalchemy.exc import InvalidRequestError, StatementError
 
 logger = logging.getLogger(f"submissions.{__name__}")
 
-class PydSheetReagent(BaseModel):
-    type: str|None
+class PydReagent(BaseModel):
+    ctx: Settings
     lot: str|None
+    type: str|None
     exp: date|None
     name: str|None
 
@@ -30,6 +36,16 @@ class PydSheetReagent(BaseModel):
                 return None
             case _:
                 return value
+            
+    @field_validator("type")
+    @classmethod
+    def rescue_type_with_lookup(cls, value, values):
+        if value == None and values.data['lot'] != None:
+            try:
+                return lookup_reagents(ctx=values.data['ctx'], lot_number=values.data['lot']).name
+            except AttributeError:
+                return value
+        return value
 
     @field_validator("lot", mode='before')
     @classmethod
@@ -70,7 +86,81 @@ class PydSheetReagent(BaseModel):
         else:
             return values.data['type']
 
-class PydSheetSubmission(BaseModel, extra='allow'):
+    def toSQL(self):# -> Tuple[Reagent, dict]:
+        result = None
+        logger.debug(f"Reagent SQL constructor is looking up type: {self.type}, lot: {self.lot}")
+        reagent = lookup_reagents(ctx=self.ctx, lot_number=self.lot)
+        logger.debug(f"Result: {reagent}")
+        if reagent == None:
+            reagent = Reagent()
+            for key, value in self.__dict__.items():
+                if isinstance(value, dict):
+                    value = value['value']
+                logger.debug(f"Reagent info item for {key}: {value}")
+                # set fields based on keys in dictionary
+                match key:
+                    case "lot":
+                        reagent.lot = value.upper()
+                    case "expiry":
+                        reagent.expiry = value
+                    case "type":
+                        reagent_type = lookup_reagent_types(ctx=self.ctx, name=value)
+                        if reagent_type != None:
+                            reagent.type.append(reagent_type)
+                    case "name":
+                        reagent.name = value
+            # add end-of-life extension from reagent type to expiry date
+            # NOTE: this will now be done only in the reporting phase to account for potential changes in end-of-life extensions
+        return reagent, result
+
+class PydSample(BaseModel, extra='allow'):
+
+    submitter_id: str
+    sample_type: str
+    row: int|List[int]|None
+    column: int|List[int]|None
+
+    @field_validator("row", "column")
+    @classmethod
+    def row_int_to_list(cls, value):
+        if isinstance(value, int):
+            return [value]
+        return value
+    
+    # @field_validator(column)
+    # @classmethod
+    # def column_int_to_list(cls, value):
+    #     if isinstance(value, int):
+    #         return [value]
+    #     return value
+
+    def toSQL(self, ctx:Settings, submission):
+        result = None
+        self.__dict__.update(self.model_extra)
+        logger.debug(f"Here is the incoming sample dict: \n{self.__dict__}")
+        instance = lookup_samples(ctx=ctx, submitter_id=self.submitter_id)
+        if instance == None:
+            logger.debug(f"Sample {self.submitter_id} doesn't exist yet. Looking up sample object with polymorphic identity: {self.sample_type}")
+            instance = BasicSample.find_polymorphic_subclass(polymorphic_identity=self.sample_type)()
+        for key, value in self.__dict__.items():
+            # logger.debug(f"Setting sample field {key} to {value}")
+            match key:
+                case "row" | "column":
+                    continue
+                case _:
+                    instance.set_attribute(name=key, value=value)
+        for row, column in zip(self.row, self.column):
+            logger.debug(f"Looking up association with identity: ({submission.submission_type_name} Association)")
+            association = lookup_submission_sample_association(ctx=ctx, submission=submission, row=row, column=column)
+            logger.debug(f"Returned association: {association}")
+            if association == None or association == []:
+                logger.debug(f"Looked up association at row {row}, column {column} didn't exist, creating new association.")
+                association = SubmissionSampleAssociation.find_polymorphic_subclass(polymorphic_identity=f"{submission.submission_type_name} Association")
+                association = association(submission=submission, sample=instance, row=row, column=column)
+                instance.sample_submission_associations.append(association)
+        return instance, result
+
+class PydSubmission(BaseModel, extra='allow'):
     ctx: Settings
     filepath: Path
     submission_type: dict|None
@@ -83,7 +173,7 @@ class PydSheetSubmission(BaseModel, extra='allow'):
     extraction_kit: dict|None
     technician: dict|None
     submission_category: dict|None = Field(default=dict(value=None, parsed=False), validate_default=True)
-    reagents: List[dict] = []
+    reagents: List[dict]|List[PydReagent] = []
     samples: List[Any]
 
     @field_validator("submitter_plate_num")
@@ -211,3 +301,165 @@ class PydSheetSubmission(BaseModel, extra='allow'):
         if value['value'] not in ["Research", "Diagnostic", "Surveillance"]:
             value['value'] = values.data['submission_type']['value']
         return value
+
+    def toSQL(self):
+        code = 0
+        msg = None
+        self.__dict__.update(self.model_extra)
+        instance = lookup_submissions(ctx=self.ctx, rsl_number=self.rsl_plate_num['value'])
+        if instance == None:
+            instance = BasicSubmission.find_polymorphic_subclass(polymorphic_identity=self.submission_type)()
+        else:
+            code = 1
+            msg = "This submission already exists.\nWould you like to overwrite?"
+        self.handle_duplicate_samples()
+        logger.debug(f"Here's our list of duplicate removed samples: {self.samples}")
+        for key, value in self.__dict__.items():
+            if isinstance(value, dict):
+                value = value['value']
+            logger.debug(f"Setting {key} to {value}")
+            # set fields based on keys in dictionary
+            match key:
+                case "extraction_kit":
+                    logger.debug(f"Looking up kit {value}")
+                    field_value = lookup_kit_types(ctx=self.ctx, name=value)
+                    logger.debug(f"Got {field_value} for kit {value}")
+                case "submitting_lab":
+                    logger.debug(f"Looking up organization: {value}")
+                    field_value = lookup_organizations(ctx=self.ctx, name=value)
+                    logger.debug(f"Got {field_value} for organization {value}")
+                case "submitter_plate_num":
+                    logger.debug(f"Submitter plate id: {value}")
+                    field_value = value
+                case "samples":
+                    # instance = construct_samples(ctx=ctx, instance=instance, samples=value)
+                    for sample in value:
+                        # logger.debug(f"Parsing {sample} to sql.")
+                        sample, _ = sample.toSQL(ctx=self.ctx, submission=instance)
+                        # instance.samples.append(sample)
+                    continue
+                case "reagents":
+                    field_value = [reagent['value'].toSQL()[0] if isinstance(reagent, dict) else reagent.toSQL()[0] for reagent in value]
+                case "submission_type":
+                    field_value = lookup_submission_type(ctx=self.ctx, name=value)
+                case "ctx" | "csv" | "filepath":
+                    continue
+                case _:
+                    field_value = value
+            # insert into field
+            try:
+                setattr(instance, key, field_value)
+            except AttributeError as e:
+                logger.debug(f"Could not set attribute: {key} to {value} due to: \n\n {e}")
+                continue
+            except KeyError:
+                continue
+        try:
+            logger.debug(f"Calculating costs for procedure...")
+            instance.calculate_base_cost()
+        except (TypeError, AttributeError) as e:
+            logger.debug(f"Looks like that kit doesn't have cost breakdown yet due to: {e}, using full plate cost.")
+            instance.run_cost = instance.extraction_kit.cost_per_run
+        logger.debug(f"Calculated base run cost of: {instance.run_cost}")
+        # Apply any discounts that are applicable for client and kit.
+        try:
+            logger.debug("Checking and applying discounts...")
+            discounts = [item.amount for item in lookup_discounts(ctx=self.ctx, kit_type=instance.extraction_kit, organization=instance.submitting_lab)]
+            logger.debug(f"We got discounts: {discounts}")
+            if len(discounts) > 0:
+                discounts = sum(discounts)
+                instance.run_cost = instance.run_cost - discounts
+        except Exception as e:
+            logger.error(f"An unknown exception occurred when calculating discounts: {e}")
+        # We need to make sure there's a proper rsl plate number
+        logger.debug(f"We've got a total cost of {instance.run_cost}")
+        try:
+            logger.debug(f"Constructed instance: {instance.to_string()}")
+        except AttributeError as e:
+            logger.debug(f"Something went wrong constructing instance {self.rsl_plate_num}: {e}")
+        logger.debug(f"Constructed submissions message: {msg}")
+        return instance, {'code':code, 'message':msg}
+    
+    def handle_duplicate_samples(self):
+        submitter_ids = list(set([sample.submitter_id for sample in self.samples]))
+        output = []
+        for id in submitter_ids:
+            relevants = [item for item in self.samples if item.submitter_id==id]
+            if len(relevants) <= 1:
+                output += relevants
+            else:
+                rows = [item.row[0] for item in relevants]
+                columns = [item.column[0] for item in relevants]
+                dummy = relevants[0]
+                dummy.row = rows
+                dummy.column = columns
+                output.append(dummy)
+        self.samples = output
+
+class PydContact(BaseModel):
+
+    name: str
+    phone: str|None
+    email: str|None
+
+    def toSQL(self, ctx):
+        return Contact(name=self.name, phone=self.phone, email=self.email)
+
+class PydOrganization(BaseModel):
+
+    name: str
+    cost_centre: str
+    contacts: List[PydContact]|None
+
+    def toSQL(self, ctx):
+        instance = Organization()
+        for field in self.model_fields:
+            match field:
+                case "contacts":
+                    value = [item.toSQL(ctx) for item in getattr(self, field)]
+                case _:
+                    value = getattr(self, field)
+            instance.set_attribute(name=field, value=value)
+        return instance
+
+class PydReagentType(BaseModel):
+
+    name: str
+    eol_ext: timedelta|int|None
+    uses: dict|None
+    required: int|None = Field(default=1)
+
+    @field_validator("eol_ext")
+    @classmethod
+    def int_to_timedelta(cls, value):
+        if isinstance(value, int):
+            return timedelta(days=value)
+        return value
+    
+    def toSQL(self, ctx:Settings, kit:KitType):
+        instance: ReagentType = lookup_reagent_types(ctx=ctx, name=self.name)
+        if instance == None:
+            instance = ReagentType(name=self.name, eol_ext=self.eol_ext)
+        logger.debug(f"This is the reagent type instance: {instance.__dict__}")
+        try:
+            assoc = lookup_reagenttype_kittype_association(ctx=ctx, reagent_type=instance, kit_type=kit)
+        except StatementError:
+            assoc = None
+        if assoc == None:
+            assoc = KitTypeReagentTypeAssociation(kit_type=kit, reagent_type=instance, uses=self.uses, required=self.required)
+            kit.kit_reagenttype_associations.append(assoc)
+        return instance
+    
+class PydKit(BaseModel):
+
+    name: str
+    reagent_types: List[PydReagentType]|None
+
+    def toSQL(self, ctx):
+        instance = lookup_kit_types(ctx=ctx, name=self.name)
+        if instance == None:
+            instance = KitType(name=self.name)
+            instance.reagent_types = [item.toSQL(ctx, instance) for item in self.reagent_types]
+        return instance
+
+
diff --git a/src/submissions/frontend/__init__.py b/src/submissions/frontend/__init__.py
index 6aa2f0c..c1e2176 100644
--- a/src/submissions/frontend/__init__.py
+++ b/src/submissions/frontend/__init__.py
@@ -15,8 +15,9 @@ from PyQt6.QtGui import QAction
 from PyQt6.QtWebEngineWidgets import QWebEngineView
 from pathlib import Path
 from backend.db import (
-    construct_reagent, store_object, lookup_control_types, lookup_modes
+    store_object, lookup_control_types, lookup_modes, #construct_reagent
 )
+from backend.validators import PydSubmission, PydReagent
 from tools import check_if_app, Settings
 from frontend.custom_widgets import SubmissionsSheet, AlertPop, AddReagentForm, KitAdder, ControlsDatePicker, ImportReagent
 import logging
@@ -220,10 +221,11 @@ class App(QMainWindow):
             info = dlg.parse_form()
             logger.debug(f"Reagent info: {info}")
             # create reagent object
-            reagent = construct_reagent(ctx=self.ctx, info_dict=info)
+            # reagent = construct_reagent(ctx=self.ctx, info_dict=info)
+            reagent = PydReagent(ctx=self.ctx, **info)
             # send reagent to db
             # store_reagent(ctx=self.ctx, reagent=reagent)
-            result = store_object(ctx=self.ctx, object=reagent)
+            result = store_object(ctx=self.ctx, object=reagent.toSQL()[0])
             self.result_reporter(result=result)
             return reagent
 
@@ -322,7 +324,7 @@ class AddSubForm(QWidget):
         logger.debug(f"Initializating subform...")
         super(QWidget, self).__init__(parent)
         self.layout = QVBoxLayout(self)
-        
+        self.parent = parent
         # Initialize tab screen
         self.tabs = QTabWidget()
         self.tab1 = QWidget()
@@ -396,6 +398,7 @@ class SubmissionFormWidget(QWidget):
     def __init__(self, parent: QWidget) -> None:
         logger.debug(f"Setting form widget...")
         super().__init__(parent)
+        self.parent = parent
         self.ignore = [None, "", "qt_spinbox_lineedit", "qt_scrollarea_viewport", "qt_scrollarea_hcontainer",
                        "qt_scrollarea_vcontainer", "submit_btn"
                        ]
@@ -411,23 +414,26 @@ class SubmissionFormWidget(QWidget):
         fname = Path([u.toLocalFile() for u in event.mimeData().urls()][0])
         self.import_drag.emit(fname)
 
-    def parse_form(self) -> Tuple[dict, list]:
-        logger.debug(f"Hello from parser!")
+    def parse_form(self) -> PydSubmission:
+        logger.debug(f"Hello from form parser!")
         info = {}
         reagents = []
+        samples = self.parent.parent.samples
+        logger.debug(f"Using samples: {pformat(samples)}")
         widgets = [widget for widget in self.findChildren(QWidget) if widget.objectName() not in self.ignore]
         for widget in widgets:
             logger.debug(f"Parsed widget: {widget.objectName()} of type {type(widget)}")
             match widget:
                 case ImportReagent():
-                    reagents.append(dict(name=widget.objectName().replace("lot_", ""), lot=widget.currentText()))
+                    reagent = dict(name=widget.objectName().replace("lot_", ""), lot=widget.currentText(), type=None, exp=None)
+                    reagents.append(PydReagent(ctx=self.parent.parent.ctx, **reagent))
                 case QLineEdit():
-                    info[widget.objectName()] = widget.text()
+                    info[widget.objectName()] = dict(value=widget.text())
                 case QComboBox():
-                    info[widget.objectName()] = widget.currentText()
+                    info[widget.objectName()] = dict(value=widget.currentText())
                 case QDateEdit():
-                    info[widget.objectName()] = widget.date().toPyDate()
+                    info[widget.objectName()] = dict(value=widget.date().toPyDate())
         logger.debug(f"Info: {pformat(info)}")
         logger.debug(f"Reagents: {pformat(reagents)}")
-        return info, reagents
-
+        submission = PydSubmission(ctx=self.parent.parent.ctx, filepath=self.parent.parent.current_file, reagents=reagents, samples=samples, **info)
+        return submission
diff --git a/src/submissions/frontend/custom_widgets/misc.py b/src/submissions/frontend/custom_widgets/misc.py
index cae5239..899f296 100644
--- a/src/submissions/frontend/custom_widgets/misc.py
+++ b/src/submissions/frontend/custom_widgets/misc.py
@@ -13,15 +13,15 @@ from PyQt6.QtWidgets import (
 )
 from PyQt6.QtCore import Qt, QDate, QSize
 from tools import check_not_nan, jinja_template_loading, Settings
-from backend.db.functions import construct_kit_from_yaml, \
+from backend.db.functions import \
     lookup_reagent_types, lookup_reagents, lookup_submission_type, lookup_reagenttype_kittype_association, \
-    lookup_submissions
+    lookup_submissions#, construct_kit_from_yaml 
 from backend.db.models import SubmissionTypeKitTypeAssociation
 from sqlalchemy import FLOAT, INTEGER
 import logging
 import numpy as np
 from .pop_ups import AlertPop
-from backend.validators import PydSheetReagent
+from backend.validators import PydReagent
 from typing import Tuple
 
 logger = logging.getLogger(f"submissions.{__name__}")
@@ -92,7 +92,7 @@ class AddReagentForm(QDialog):
     def parse_form(self):
         return dict(name=self.name_input.currentText(), 
                     lot=self.lot_input.text(), 
-                    expiry=self.exp_input.date().toPyDate(),
+                    exp=self.exp_input.date().toPyDate(),
                     type=self.type_input.currentText())
 
     def update_names(self):
@@ -386,11 +386,11 @@ class ControlsDatePicker(QWidget):
 
 class ImportReagent(QComboBox):
 
-    def __init__(self, ctx:Settings, reagent:dict|PydSheetReagent, extraction_kit:str):
+    def __init__(self, ctx:Settings, reagent:dict|PydReagent, extraction_kit:str):
         super().__init__()
         self.setEditable(True)
         if isinstance(reagent, dict):
-            reagent = PydSheetReagent(**reagent)
+            reagent = PydReagent(ctx=ctx, **reagent)
         # Ensure that all reagenttypes have a name that matches the items in the excel parser
         query_var = reagent.type
         logger.debug(f"Import Reagent is looking at: {reagent.lot} for {query_var}")
diff --git a/src/submissions/frontend/main_window_functions.py b/src/submissions/frontend/main_window_functions.py
index 7736b06..bb1ae23 100644
--- a/src/submissions/frontend/main_window_functions.py
+++ b/src/submissions/frontend/main_window_functions.py
@@ -24,12 +24,14 @@ from .all_window_functions import select_open_file, select_save_file
 from PyQt6.QtCore import QSignalBlocker
 from backend.db.models import BasicSubmission
 from backend.db.functions import (
-    construct_submission_info, lookup_reagents, construct_kit_from_yaml, construct_org_from_yaml, get_control_subtypes,
+    lookup_reagents, get_control_subtypes,
     update_subsampassoc_with_pcr, check_kit_integrity, update_last_used, lookup_organizations, lookup_kit_types, 
     lookup_submissions, lookup_controls, lookup_samples, lookup_submission_sample_association, store_object, lookup_submission_type,
+    #construct_submission_info, construct_kit_from_yaml, construct_org_from_yaml
 )
 from backend.excel.parser import SheetParser, PCRParser, SampleParser
 from backend.excel.reports import make_report_html, make_report_xlsx, convert_data_list_to_df
+from backend.validators import PydSubmission, PydSample, PydReagent
 from tools import check_not_nan, convert_well_to_row_column
 from .custom_widgets.pop_ups import AlertPop, QuestionAsker
 from .custom_widgets import ReportDatePicker
@@ -79,6 +81,7 @@ def import_submission_function(obj:QMainWindow, fname:Path|None=None) -> Tuple[Q
     for item in obj.table_widget.formlayout.parentWidget().findChildren(QWidget):
         item.setParent(None)
     obj.current_submission_type = pyd.submission_type['value']
+    obj.current_file = pyd.filepath
     # Get list of fields from pydantic model.
     fields = list(pyd.model_fields.keys()) + list(pyd.model_extra.keys())
     fields.remove('filepath')
@@ -97,7 +100,6 @@ def import_submission_function(obj:QMainWindow, fname:Path|None=None) -> Tuple[Q
                 logger.debug(f"{field}: {value['value']}")
                 # create combobox to hold looked up submitting labs
                 add_widget = QComboBox()
-                # labs = [item.__str__() for item in lookup_all_orgs(ctx=obj.ctx)]
                 labs = [item.__str__() for item in lookup_organizations(ctx=obj.ctx)]
                 # try to set closest match to top of list
                 try:
@@ -149,12 +151,7 @@ def import_submission_function(obj:QMainWindow, fname:Path|None=None) -> Tuple[Q
                 except ValueError:
                     cats.insert(0, cats.pop(cats.index(pyd.submission_type['value'])))
                 add_widget.addItems(cats)
-            case "ctx":
-                continue
-            case 'reagents':
-                # NOTE: This is now set to run when the extraction kit is updated.
-                continue
-            case 'csv':
+            case "ctx" | 'reagents' | 'csv' | 'filepath':
                 continue
             case _:
                 # anything else gets added in as a line edit
@@ -178,7 +175,6 @@ def import_submission_function(obj:QMainWindow, fname:Path|None=None) -> Tuple[Q
     if "csv" in pyd.model_extra:
         obj.csv = pyd.model_extra['csv']
     logger.debug(f"All attributes of obj:\n{pprint.pformat(obj.__dict__)}")
-    
     return obj, result
 
 def kit_reload_function(obj:QMainWindow) -> Tuple[QMainWindow, dict]:
@@ -265,41 +261,44 @@ def submit_new_sample_function(obj:QMainWindow) -> Tuple[QMainWindow, dict]:
     # # seperate out reagents
     # reagents = {k.replace("lot_", ""):v for k,v in info.items() if k.startswith("lot_")}
     # info = {k:v for k,v in info.items() if not k.startswith("lot_")}
-    info, reagents = obj.table_widget.formwidget.parse_form()
-    logger.debug(f"Info: {info}")
-    logger.debug(f"Reagents: {reagents}")
+    # info, reagents = obj.table_widget.formwidget.parse_form()
+    submission: PydSubmission = obj.table_widget.formwidget.parse_form()
+    logger.debug(f"Submission: {pprint.pformat(submission)}")
     parsed_reagents = []
     # compare reagents in form to reagent database
-    for reagent in reagents:
+    for reagent in submission.reagents:
         # Lookup any existing reagent of this type with this lot number
-        wanted_reagent = lookup_reagents(ctx=obj.ctx, lot_number=reagent['lot'], reagent_type=reagent['name'])
+        wanted_reagent = lookup_reagents(ctx=obj.ctx, lot_number=reagent.lot, reagent_type=reagent.name)
         logger.debug(f"Looked up reagent: {wanted_reagent}")
         # if reagent not found offer to add to database
         if wanted_reagent == None:
             # r_lot = reagent[reagent]
-            r_lot = reagent['lot']
-            dlg = QuestionAsker(title=f"Add {r_lot}?", message=f"Couldn't find reagent type {reagent['name'].strip('Lot')}: {r_lot} in the database.\n\nWould you like to add it?")
+            dlg = QuestionAsker(title=f"Add {reagent.lot}?", message=f"Couldn't find reagent type {reagent.name.strip('Lot')}: {reagent.lot} in the database.\n\nWould you like to add it?")
             if dlg.exec():
-                logger.debug(f"Looking through {pprint.pformat(obj.reagents)} for reagent {reagent['name']}")
+                logger.debug(f"Looking through {pprint.pformat(obj.reagents)} for reagent {reagent.name}")
                 try:
-                    picked_reagent = [item for item in obj.reagents if item.type == reagent['name']][0]
+                    picked_reagent = [item for item in obj.reagents if item.type == reagent.name][0]
                 except IndexError:
-                    logger.error(f"Couldn't find {reagent['name']} in obj.reagents. Checking missing reagents {pprint.pformat(obj.missing_reagents)}")
-                    picked_reagent = [item for item in obj.missing_reagents if item.type == reagent['name']][0]
-                logger.debug(f"checking reagent: {reagent['name']} in obj.reagents. Result: {picked_reagent}")
+                    logger.error(f"Couldn't find {reagent.name} in obj.reagents. Checking missing reagents {pprint.pformat(obj.missing_reagents)}")
+                    picked_reagent = [item for item in obj.missing_reagents if item.type == reagent.name][0]
+                logger.debug(f"checking reagent: {reagent.name} in obj.reagents. Result: {picked_reagent}")
                 expiry_date = picked_reagent.exp
-                wanted_reagent = obj.add_reagent(reagent_lot=r_lot, reagent_type=reagent['name'].replace("lot_", ""), expiry=expiry_date, name=picked_reagent.name)
+                wanted_reagent = obj.add_reagent(reagent_lot=reagent.lot, reagent_type=reagent.name.replace("lot_", ""), expiry=expiry_date, name=picked_reagent.name)
             else:
                 # In this case we will have an empty reagent and the submission will fail kit integrity check
                 logger.debug("Will not add reagent.")
                 return obj, dict(message="Failed integrity check", status="critical")
-        parsed_reagents.append(wanted_reagent)
+        # Append the PydReagent object o be added to the submission
+        parsed_reagents.append(reagent)
     # move samples into preliminary submission dict
-    info['samples'] = obj.samples
-    info['uploaded_by'] = getuser()
+    submission.reagents = parsed_reagents
+    # submission.uploaded_by = getuser()
     # construct submission object
-    logger.debug(f"Here is the info_dict: {pprint.pformat(info)}")
-    base_submission, result = construct_submission_info(ctx=obj.ctx, info_dict=info)
+    # logger.debug(f"Here is the info_dict: {pprint.pformat(info)}")
+    # base_submission, result = construct_submission_info(ctx=obj.ctx, info_dict=info)
+    base_submission, result = submission.toSQL()
+    # delattr(base_submission, "ctx")
+    # raise ValueError(base_submission.__dict__)
     # check output message for issues
     match result['code']:
         # code 1: ask for overwrite
@@ -307,7 +306,8 @@ def submit_new_sample_function(obj:QMainWindow) -> Tuple[QMainWindow, dict]:
             dlg = QuestionAsker(title=f"Review {base_submission.rsl_plate_num}?", message=result['message'])
             if dlg.exec():
                 # Do not add duplicate reagents.
-                base_submission.reagents = []
+                # base_submission.reagents = []
+                pass
             else:
                 obj.ctx.database_session.rollback()
                 return obj, dict(message="Overwrite cancelled", status="Information")
@@ -317,16 +317,17 @@ def submit_new_sample_function(obj:QMainWindow) -> Tuple[QMainWindow, dict]:
         case _:
             pass
     # add reagents to submission object
-    for reagent in parsed_reagents:
-        base_submission.reagents.append(reagent)
+    for reagent in base_submission.reagents:
         update_last_used(ctx=obj.ctx, reagent=reagent, kit=base_submission.extraction_kit)
-    logger.debug(f"Parsed reagents: {pprint.pformat(parsed_reagents)}")
+    logger.debug(f"Here is the final submission: {pprint.pformat(base_submission.__dict__)}")
+    logger.debug(f"Parsed reagents: {pprint.pformat(base_submission.reagents)}")
     logger.debug("Checking kit integrity...")
     kit_integrity = check_kit_integrity(base_submission)
     if kit_integrity != None:
         return obj, dict(message=kit_integrity['message'], status="critical")
     logger.debug(f"Sending submission: {base_submission.rsl_plate_num} to database.")
-    result = store_object(ctx=obj.ctx, object=base_submission)
+    # result = store_object(ctx=obj.ctx, object=base_submission)
+    base_submission.save(ctx=obj.ctx)
     # update summary sheet
     obj.table_widget.sub_wid.setData()
     # reset form
@@ -339,9 +340,10 @@ def submit_new_sample_function(obj:QMainWindow) -> Tuple[QMainWindow, dict]:
         logger.debug(f"We have the extraction kit: {extraction_kit.name}")
         excel_map = extraction_kit.construct_xl_map_for_use(obj.current_submission_type)
         logger.debug(f"Extraction kit map:\n\n{pprint.pformat(excel_map)}")
-        input_reagents = [item.to_reagent_dict(extraction_kit=base_submission.extraction_kit) for item in parsed_reagents]
+        input_reagents = [item.to_reagent_dict(extraction_kit=base_submission.extraction_kit) for item in base_submission.reagents]
         logger.debug(f"Parsed reagents going into autofile: {pprint.pformat(input_reagents)}")
-        autofill_excel(obj=obj, xl_map=excel_map, reagents=input_reagents, missing_reagents=obj.missing_reagents, info=info, missing_info=obj.missing_info)
+        # autofill_excel(obj=obj, xl_map=excel_map, reagents=input_reagents, missing_reagents=obj.missing_reagents, info=info, missing_info=obj.missing_info)
+        autofill_excel(obj=obj, xl_map=excel_map, reagents=input_reagents, missing_reagents=obj.missing_reagents, info=base_submission.__dict__, missing_info=obj.missing_info)
     if hasattr(obj, 'csv'):
         dlg = QuestionAsker("Export CSV?", "Would you like to export the csv file?")
         if dlg.exec():
diff --git a/src/submissions/tools/__init__.py b/src/submissions/tools/__init__.py
index d253dcb..b7991a0 100644
--- a/src/submissions/tools/__init__.py
+++ b/src/submissions/tools/__init__.py
@@ -17,7 +17,6 @@ from sqlalchemy import create_engine
 from pydantic import field_validator
 from pydantic_settings import BaseSettings, SettingsConfigDict
 from typing import Any, Tuple
-from datetime import datetime
 
 logger = logging.getLogger(f"submissions.{__name__}")
 
@@ -55,6 +54,11 @@ def check_not_nan(cell_contents) -> bool:
         cell_contents = cell_contents.lower()
     except (TypeError, AttributeError):
         pass
+    try:
+        if np.isnat(cell_contents):
+            cell_contents = np.nan
+    except TypeError as e:
+        pass
     if cell_contents == "nat":
         cell_contents = np.nan
     if cell_contents == 'nan':
@@ -89,38 +93,6 @@ def convert_nans_to_nones(input_str) -> str|None:
         return input_str
     return None
 
-# def create_reagent_list(in_dict:dict) -> list[str]:
-#     """
-#     Makes list of reagent types without "lot_" prefix for each key in a dictionary
-
-#     Args:
-#         in_dict (dict): input dictionary of reagents
-
-#     Returns:
-#         list[str]: list of reagent types with "lot_" prefix removed.
-#     """    
-#     return [item.strip("lot_") for item in in_dict.keys()]
-
-# def retrieve_rsl_number(in_str:str) -> Tuple[str, str]:
-#     """
-#     Uses regex to retrieve the plate number and submission type from an input string
-#     DEPRECIATED. REPLACED BY RSLNamer.parsed_name
-    
-#     Args:
-#         in_str (str): string to be parsed
-
-#     Returns:
-#         Tuple[str, str]: tuple of (output rsl number, submission_type)
-#     """    
-#     in_str = in_str.split("\\")[-1]
-#     logger.debug(f"Attempting match of {in_str}")
-#     regex = re.compile(r"""
-#         (?P<wastewater>RSL-?WW(?:-|_)20\d{6}(?:(?:_|-)\d(?!\d))?)|(?P<bacterial_culture>RSL-\d{2}-\d{4})
-#         """, re.VERBOSE)
-#     m = regex.search(in_str)
-#     parsed = m.group().replace("_", "-")
-#     return (parsed, m.lastgroup)
-
 def check_regex_match(pattern:str, check:str) -> bool:
     try:
         return bool(re.match(fr"{pattern}", check))
@@ -438,26 +410,6 @@ def jinja_template_loading():
     env.globals['STATIC_PREFIX'] = loader_path.joinpath("static", "css")
     return env
 
-# def check_is_power_user(ctx:Settings) -> bool:
-#     """
-#     Check to ensure current user is in power users list.
-#     NOTE: Depreciated in favour of 'check_authorization' below.
-
-#     Args:
-#         ctx (dict): settings passed down from gui.
-
-#     Returns:
-#         bool: True if user is in power users, else false.
-#     """    
-#     try:
-#         check = getpass.getuser() in ctx.power_users
-#     except KeyError as e:
-#         check = False
-#     except Exception as e:
-#         logger.debug(f"Check encountered unknown error: {type(e).__name__} - {e}")
-#         check = False
-#     return check
-
 def check_authorization(func):
     def wrapper(*args, **kwargs):
         logger.debug(f"Checking authorization")