Added exercise 2
Simple version of exercise 3
Streamlined exercise 3 and added use of map