Implement more media file stuff