Template ready
New updates with Exercise 1 and 2: 1 remains incomplete
Final changes submitted