Please merge _Block into master.

I've made lots of additions; see commit history for more.