Syncing up, about to make a branch to prevent all of these conflicts