Merged my work
Added comment functionality