More work integrating foundation