Added a TODO
Added TODOs.
Merge branch 'master' of github.com:Bronkoknorb/Server-Switcher