making progress on #7