Dynamic partitioning mostly works now