Adding support for videos
video support complete. tests refactored.