Worked More

-Some restructuring
-Need to test code to read in clauses and finish restructuring