Fixed up shaders and handles.  Encapsulated them and stuff