Initial project merge