Get it all working for mp4 files
Cleanup