In-Dev work towards CanaryModTeam/CanaryMod#40