Add more debugging tools for now.