I know this code is still in development, but I wanted to tag this so we don't overlook it.  This needs to be corrected, or commented.