[wip] even more work on player redesign