Begun but unfinished: integrating major overhaul of square/waypoint generation.