PEP-8
Adding support for 2d queries. Not yet finished.