That makes sense; I'll move the logic to form-and-submit.