Initial work on #26