Some more TODO markup as I investigate where to review with Julian the changes that need to be made.