On second thought, let's stick with everything in the deploy...