Write video entry tests
Write video entry interface
Merge branch 'feature/17463_take_two' into develop
Undo accidental merge