Refactoring
Big change, fixing lots of little concurrency issues.