Replaced Bundle with Plugin, added Gundo