Rejig the TODOs

Skeletons for more examples