Intermediate commit: adding media player