Merge in Pedro's changes, compile to HTML