CH-832: Allow for multiple sets of data.

This applies the needed markup changes along with javascript function needed to allow for multiple sets of data to be used.