Branching before merging back in.
Merge branch 'player-testing'

Adding back in my testing code for the player
Removing old Player cruft