partitions, as per discussion. Passes functionality checks, but I don't have any performance data yet.