Week 3 Done. + modified.