More constraints
Make sure ands are in conde.
Removed old code and fixed constraints
Added all white test
prepare for recursion