Finished query structure, added trapezoidulation vertical and horizontal splits