Refined initial iteration.  Added stubs.