Finished discussion 7 and homework 6