Interim commit to save changes.  This is just restructuring the code.  This is is a non-working commit.