Finished up

Finished up the different types of validation