WIP
Fixed remaining issues. We now have video, too!