Working further on #22.