Closes #3 (though it doesn't add any performance indexes).