Started testing field validation. Made some changes to correspond
to testing. Everything passes.