More code and resources from vanilla player (still manageable).