Switch to using configs and manual form submit