Exploratory surgery complete.

Now time to put in patches