Condition Thing, and Data Getters  and Setters
Fixed Merge Conflict
Condition Unit Test
Fixed merge conflict