Reworking the form. Still need to add JS show/hide features.