Initial work on #40