Almost done. Need to clean the debug info.