Add new forms and controls, add logic