7 Years Ago
1st merge pass