Phil

CM and I added tasks 2 and 3 from the google doc ("Avoid file duplication" and "file appending"). Pretty straightforward changes, but I can show you them this week and we can think about whether they can be refactored.