Parallel

Merging in initial work on refactoring, parallel links