Debugging moved to a single file to control what is happening, progress is good