Initial commit of debug changes