Debugger

Seems ready to merge