WIP Search builder etc
Add Aggregate objects
Fix merge conflicts