Planner Refactoring Hopefully Done