first commit
Merge https://github.com/EliCash82/demo_files_new_media_class