Working on integrating the new debugging strategy