Lots of reference changes
Merge branch 'master' of https://github.com/bhsgoclub/Oblivion