squashed query builder changes
sorting and paging working together in queries!
begin thinking about the audit log