Unblock

Please comment and review.
Oops, I forgot a few `return`s. Too much Streamline made me lazy.