Incorporating Jack's code
Merge branch 'master' of https://github.com/mmaisel/prof-plum-revenge