Updated main file to match our latest thinking on the design.