Shader and rendering updates

Getting there...