commit before redesigning the core media classes