Form refactoring WIP