Shit ton of changes (Trevor)