some sort of progress
Merge branch 'master' of https://github.com/petitJAM/TGMC-Watson-Edition