WIP on moving over to OpenGL