Initial TP2 + Week 2_a done