Adding debugger and controller stuff