week7 and week6 tasks commit