Greatly simplify block storage and dispatch
Merge pull request #3 from rpetrich/master

Greatly simplify block storage and dispatch