Initial debug solution in place closes #171