It doesn't work yet, but it's far better than the mess that was there