Cleaning up the client side of things, need to write own version of the namedtuple portion/extend it to add in methods for each type to give easier manipulation without having to pass the objects back to a central API so explicitly.