What do you think about pulling these validators out into separate files? Might make this smaller.