Changing pretty much everything to make various player support easier