Form refactor in progress