Added some query ordering
The start of something new