Get player draw code in place.
Fix merge.