Built out more unit tests and validator functionality. It's clear that the validator and model need to be broken into classes.