First pass of company-mode integration