unique per partition
move files to better named controller
deal properly with partitions