Changes based upon testing
Added a whole bunch of test for FormBuilder