Add video support
Update TODO