Trying to get playUri working, pushed to pull
Fixed conflict