More work on getting partitioning up and running