Worked on planner, need to merge