add simple form and refactor forms