Oh, that commented out section above is larger than I originally thought :)