Except for adding comments, this appear to be functioning perfectly.