This was another good idea (moving code into a setup class).  I considered doing something similar, and now I can't remember why.  Thanks!