Do you mind if I add some kind of error handling/validation back in here?