started refactoring form creation (broken state)