completely revamped with better planner
revamped the entire thing to support new planner