Started week3, need to refactor ex1