Creating Player from Choosy works to a limited degree
Merge origin/master