changed how the form input works for greater generality and simplistic usage of logic testing