Some work on #40