Part 2 Q2

Adding Q2 from Part 2. Also, chaining some earlier code from Q1, Part 2