New functions added

week 2 finished, week 3 started