Separated the Form manipulation and actual forms, and made more progress on the manipulation.