Storage blocks now use metadata

DUUUUUUUUUUH