Altered the logic and the form callback a little so we only use one submit function