Added last of the comment functionality.