first untested draft of new planner complete