Problem solved!  Check my revisions please.