moved the first handler code out of the OnClickListener constructor.  It was pretty ugly how it was implemented