JPM: added a list of TODOs, some of which I had hoped to pick up already.