Video sprint58

All the work for video sprint58