Initial work on #45