Blocks

Will be merged to master when ep9 comes out
Revert "Blocks"

This reverts commit f53e8b3f576fefcb0985258d0231d9c5c9887ef0.