Video Activity works!

I think it's time to merge into master.