Merge parallelization

Beginnings of parallization support