More work on refactored shader class.