Major change to SQL.  Might help make things more efficient, though likely to break lots too