Finished week 2

Completed all code and further tasks for week 2