started working on #7 and #2