Started work on #7.