Finished up validator