Finished 4 & 6
Work on #7