Getting closer to done.  Reorged for submission.