Changed variable structure to utilize dictionaries / updated all functions to include dictionary calls