Think I finished validation