Would be happy to do this a similar items, but I'd like to land what I have ASAP so that there aren't more merge conflicts.  I pretty much kept the old code as similar as possible, just pulled the scripts out into their own templates for this PR.