Comments

Implemented comments and tests