direct definitions only. Also optimize the quad map.
combinatorial explosion bug