Finished week-2 re-do of all exercises