MUSIC ADDED!!! BRR BRR BRRRRR
merged jay's stuff with mine, there weren't really any issues
merged stuff sorted out?