Finished 6 and 7, but did not update with algorithms