Redone the result collection

Completly redone the way the return data was handled!
Merge remote-tracking branch 'origin/easy_data'