Working on #7 & #8