Refactored single-block stuff, works