Get the foundation in place for #1580