wip: finishing up the form
Finished refactoring