- initial refactor of forms to use new goTo
- updating forms to work with new events