Lots of changes, need to track down a bug with duplicate videos