TODO

Stuff from discussions with Pete: