Could you add this to #395? It would be good to keep all viewpoints in the same place.