with this commit we move from using the player object to using the mixin
that was introduced a few commits before. The new mixin is way easier to
use here, we safe a lot of code, we also only need 1 object instead of
- (And overall, everything just gets sooooo much more easier).
Depends on D10636