Initial updates s.t. we may both branch from a common trunk