Mostly done with refactor. About to try parfor things