Rewrote addWhere and where grouping to work with new conditional. groupIn is incomplete but is next step.