bug 1 complete.  ready for review