move into our package
add a debug helper