Still working on the query builder. Looking pretty slick now with lines being drawn