Assessment part almost complete and almost working
Merge remote-tracking branch 'origin/master'