Charts all working.  Lazy loading removed.
To do: add diversity and try to restore lazy loading.