Progress on #445