Play/stop, removed reference to Names.plist
Merge