Added missing files
Some debugger work