added logic and set, and tests for logic. currently failing for ellipses