Bring old code up to date.  Need to test.. everything.