Last commit before I change the plan to just doing HTML displays.