Commenting done.  Needs testing done