Working on TODOs.  Incorporating input from Simon.