WIP on week1, 2 and 3 added