Note, all this work on video_module.py is going to conflict with what Peter is working on now.