Work on #8 and #9