Updates!  More usage of single script, old stuff removed.