Move all muck stuff to plugin