Ton of awesome new changes