almost finished
erge branch 'master' of https://github.com/dominicfrost/AdvancedSE