Added some todo's
Merge branch 'master' of github.com:Zofie/Memory