more partitioning wip