Totes.  Refactoring both this and #69 to use validation function.