More parallelism
Tweak
Merge pull request #22 from lloydmeta/refactor/more_parallel

Refactor/more parallel