work in progress on returning results, not ordered when returning
fixed for a working copy
Merge branch 'working'