skip earlier if no block was given
properly split the works
lesson learned: no tests, no correctness :/