version 2 exercise 1 and two completed