generalize and start working on non-gaited planner