Proper Audio/Video Dumping

READY TO MERGE

Screwed up the previous PR, replacing with new PR

Old notes: