First pass: add samples and expand overview