Proper? validation complete. I dont like it though. Will edit