Less debug and hopefully a fix.
Basic to test it works.