Data storage

Untested. I can't get ToK to boot up.
Should work though.