Continued debugging attempts, with experimentation on safer branch