Moved some methods around and start spill query