diff --git a/app/models/calendar.rb b/app/models/calendar.rb
index 5b55280..eaaa1a9 100644
--- a/app/models/calendar.rb
+++ b/app/models/calendar.rb
@@ -1,3 +1,4 @@
 class Calendar < ActiveRecord::Base
   attr_accessible :name, :public
+  has_and_belongs_to_many :calentries
 end
diff --git a/app/models/calentry.rb b/app/models/calentry.rb
index 6e892ad..7d7ded6 100644
--- a/app/models/calentry.rb
+++ b/app/models/calentry.rb
@@ -1,4 +1,10 @@
 class Calentry < ActiveRecord::Base
-  attr_accessible :ende, :start, :summary, :typ
-  
+  attr_accessible :ende, :start, :summary, :typ,:calendar_ids
+  has_and_belongs_to_many :calendar
+  def start_time
+    start
+  end
+  def name
+	summary
+  end
 end
diff --git a/db/migrate/20130808062732_create_calendar_calentries_join_table.rb b/db/migrate/20130808062732_create_calendar_calentries_join_table.rb
new file mode 100644
index 0000000..bbf0362
--- /dev/null
+++ b/db/migrate/20130808062732_create_calendar_calentries_join_table.rb
@@ -0,0 +1,13 @@
+class CreateCalendarCalentriesJoinTable < ActiveRecord::Migration
+  def up
+  create_table :calendars_calentries, :id=>false do |t|
+      t.integer  :calentry_id
+      t.integer  :calendar_id
+    end
+    add_index :calendars_calentries, [:calentry_id, :calendar_id]
+    add_index :calendars_calentries, :calendar_id
+  end
+
+  def down
+  end
+end