First planner finally in.  Took a lot of thingking and rewriting.