Starting Part B

- Also, a few changes to "Part A"
old