Video change to support albums

If we're good with this I'll merge my aweplug branch into master and update here.