Final version, initial draft
Merge pull request #62 from edx/ahodges/vid

Final version, initial draft