looks like this is the crux of the change and everything else is just housekeeping, yeah?