Ongoing rework as I discover more about ordering and dependencies, and the wacky puppet syntax