Continued work on integrating debugger