updated for what's done, and what still needs doing.