More work for #39
The debug never ends!