wip: before refactor
Clean up blocks stream api