debugger-wip merge