More work towards getting Partitions working.