Oh crap, that's a lot of things that will need to be updated by moving that. Someone needs to buy me a beer when I'm done with this patch. ;)