continued working on #9
Started working on #8