Maybe this will fix it...?

The refactoring continues!
Merge branch 'master' of github.com:Bacon41/PantheonPrototype