updated todos
Merge branch 'master' of github.com:Valtech-NAS/Beta