Final commit for media player base