Week 3 - Final Version

All tasks for week 3 done.