cleaned up exercise 1 and initial commit of exercise 2