Squashed commit of the following:

commit 9617b3912fc4435e8db3ea879d8e59b41969433a
Author: Abraham Heward <aheward@rsmart.com>
Date:   Fri Oct 3 08:29:46 2014 -0700

    Questionnaire and Supplemental Info stuff.