Turn Arounds

Merge the first few turnarounds that I fixed in my fork into master so I can continue this work directly on the main repo.