changing to object style query's as there are more easy to understand/work with and change.