Preparation for further abstraction and some random refactoring
Merge branch 'master' of ssh://git@github.com/apcragg/3d-Demo.git