Initial work on #41