Data storage

Untested. I can't get ToK to boot up.
Should work though.
Merge pull request #1 from dries007/master

Data storage system