This code is terrible. Tempted to merge it without tests mainly to see what happens.