Started on spec for #1348