Progress on #17 Item 3