Redesign

Oh man, wouldn't form type validation be awesome here? Probably not in the scope, but would save a whole class of errors!