completed most of the TODOs and FIXMEs
Merge branch 'master' of github.com:TestingTechnologies/PlayITS