First pass at block storage updates

For #2