More work on the video implementation.