Updated TODO's
Merge branch 'master' of https://github.com/MMODM/mmodm