Music player, more changes to come....