First iteration incorporating Tu's draconian layout edits