Refactoring in progress -- working on shaders now