move our stuff to custom plugins