Progress: TODO and trace