Moved stuff around to match final report format.