Work continues on Shader class...