Started working on issue 6