Add some TODOs, and reorder methods so we can start comparing the 2
query types