Merge Second Part of Week 4

So much TDD. Good for learning. Loved the token stuff.