moving plugin stuff around