#80 Move form to forms file