Video team work for sprint 59

All of the code was reviewed in individual pull requests.