Restructed project, created unit tests for Condition, fixed bugs until all but one test passed