Updated iteration of Form Logic - soon to be an AngularJS component