You guessed it: Still hacking away at the CameraDriver.