Convert the rest of the forms to the new builder