Updated to make the install more one-step to get to the kind of system that we've been working with.