Added a few more fields.  Switched to quickforms for time being