Some work on comment scrabbing, disabled for now