Safety Commit

This is to save before hefty change
Commit includes html and formatting changes