cleaned up user input validation.  one fixme left with logic question for marc.  otherwise ready to start on test.
https://app.asana.com/0/19128794071925/19594215856460