working on the storage, doing a merkle tree anyway :/