for debugging
wip
Merge branch 'master' into debug
wip
wip
Better, but still doesn't balance right on deletes