wip: refactor blockmanager #3