Major concurrency improvements, some refactoring preview