Working on #8.