taking out partitioner
Merge remote-tracking branch 'origin/partition-refactor' into partition-refactor
Finish refactoring of partitioner so that tests pass