adds new hash structure
Fixes issue with new structure
Adds an output to html
uncomments commented out code