add video functionality
resolving conflicts on pull