Closes #3618. Upgrades the simple block database to something that can actually be used.

Changelog: feature