mid refactor of forms