Completed HTML for CS

Had merg conflicts when Bill tried to update so we did a manual merg.
This is the result