Start reworking comments