Continued Work on Comments

Work on Comments