It's validating...still have a little cleanup