Most of the new next-point planner based on the cgrid should be there,
though it's not called yet and not tested yet. Intermed commit, possible
triggering some merges