moving in a whole bunch of goodness from previous projects