More TODO
Merge branch 'master' of github.com:Sorck/smCore into Storage