Music Player project, April 6th commit