Interim commit for early integration effort