Get a bit closer to making this partitioning thing work