Fixed test Logic so everything compiles.  now to write test cases to make sure the structures actually work