Refactor: Query can just be a named tuple now
Added: TODOs