Stage3

I believe this is a replacement for stage2.  This one merges cleanly. -- Mike