Trapping the in  html content list first working commit.
Merge branch 'cleanup'