Working on #7.