Relates to #5. Got the validation working