Working on #9 and #10