Some work on debug, skipping, etc.