Field refactors
Finishes form validation