Cleaned up client thread real nice
Instructions for running test
Massive refactor for cleanliness and testability