player and browse working
merge