ADD: Stefan + Roland code for partitioning.