Big changes again
New partitioning infrastructure