Add point context stuff.  Modify stage ctor to take PointContext.

I'm not in love with the way stages get chained, but I think it will change again before I'm done.