Changed stuff
Merge branch 'master' of https://github.com/man1utdfan/Freedom
Added todo