Syncing up
Intermediate Commit on Architecture Section