Adding a study of level reached to rapport
Removing some TODO
Merge remote-tracking branch 'origin/master'