Formatting and Validations

@s4g3 I've added a few more failing tests to make pass. I've also outlined a test (it's pending) that you'll need to complete in order to test the extra validations you added.

Just pull this branch (or "Sync" in Github.app and then switch to this branch) and run `rspec -fd` to see the failing/pending tests.