Initial work on #7.