wip
more
rebase fixes
more rebase fixes
fix deadlock