Yep, just missed this one.  I'll revert out the contam changes for now so that they don't conflict with Jason's work