One crap-ton of changes later...