Progress on #11.