WIP latest version queries working but there is still some work to do seriaizing the response