Added comments functionality. need to test it