Split block-level stuff into own module
Merge branch 'master' into Hook
Test stub