First cut of #1320