They're commented because I didn't refactor through them yet since we don't use them.  But we *will* at some point...