Update with new faster tree lookup and building.
Remove q.py