Removed some of the todo's.
And some more...
Final todo done!
Merge branch 'master' of https://github.com/mikaelec/sw505-courses