diff --git a/config/initializers/init_flagable.rb b/config/initializers/init_flagable.rb
new file mode 100644
index 0000000..a2702e6
--- /dev/null
+++ b/config/initializers/init_flagable.rb
@@ -0,0 +1,2 @@
+require 'flagable'
+ActionController::Base.send :include, Flagable::ActsAsFlagable
diff --git a/db/migrate/20150620101949_add_flags_to_beispiel.rb b/db/migrate/20150620101949_add_flags_to_beispiel.rb
new file mode 100644
index 0000000..45c0d81
--- /dev/null
+++ b/db/migrate/20150620101949_add_flags_to_beispiel.rb
@@ -0,0 +1,14 @@
+class AddFlagsToBeispiel < ActiveRecord::Migration
+  def change
+    add_column :beispiele, :flag_badquality, :boolean
+    add_column :beispiele, :flag_duplicate, :boolean
+    add_column :beispiele, :flag_delete, :boolean
+    add_column :beispiele, :flag_goodquality, :boolean
+    add_column :beispiele, :lecturer_id, :integer
+    add_index :beispiele,  :flag_badquality
+    add_index :beispiele, :flag_duplicate
+    add_index :beispiele, :flag_delete
+    add_index :beispiele, :flag_goodquality
+
+  end
+end
diff --git a/lib/flagable.rb b/lib/flagable.rb
index 882562e..a1db136 100644
--- a/lib/flagable.rb
+++ b/lib/flagable.rb
@@ -13,13 +13,18 @@ module Flagable
     module LocalInstanceMethods
       def flag
          @obj=controller_name.classify.constantize.find(params[:id])
-        text @obj.to_yaml
+        lflag=("flag_"+params[:flag]).to_sym
+        unless params[:flag].nil? || params[:flag].empty? || params[:value].nil?
+          @obj.try(lflag)#=params[:value]
+          @obj.send(lflag.to_s+"=",params[:value])
+        end
+        respond_to do |format|
+          format.html {render :text=>@obj.to_yaml}
+          format.js {render :text => "alert(#{lflag.to_s} #{@obj.to_yaml})"}
+        end
       end
     end
   end
 end
-ActionController::Base.send :include, Flagable::ActsAsFlagable
-ActionController.send :include, Flagable::ActsAsFlagable
 
-ApplicationController.send :include, Flagable::ActsAsFlagable
-BeispielController.send :include, Flagable::ActsAsFlagable
+