This is kinda hard to read as a diff... I essentially removed all of the old stuff, so it's probably easiest to skim past the (-) and read only the (+).