First pass at v3 layout