Snapshot 2

Refined design, built out structure with placeholders