wip
more
rebase fixes
more rebase fixes
fix deadlock
improve redistribution cases
finish up test