diff --git a/examples/hero/heromodels/heromodels_calendar.vsh b/examples/hero/heromodels/heromodels_calendar.vsh
new file mode 100644
index 00000000..8cd2fdb1
--- /dev/null
+++ b/examples/hero/heromodels/heromodels_calendar.vsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env -S v -n -w -cg -gc none -cc tcc -d use_openssl -enable-globals run
+
+import freeflowuniverse.herolib.core.redisclient
+import freeflowuniverse.herolib.hero.heromodels
+
+mut mydb := heromodels.new()!
+// mydb.calendar.db.redis.flushdb()!
+
+mut o := mydb.calendar.new(
+	name: 'Work Calendar'
+	description: 'Calendar for work events'
+	color: '#FF0000'
+	timezone: 'Europe/Brussels'
+	is_public: false
+	events: [1, 2, 3]
+)!
+
+// Add tags if needed
+o.tags = mydb.calendar.db.tags_get(['work', 'important'])!
+
+// Add comments if needed
+// o.comments = mydb.calendar.db.comments_get([CommentArg{comment: 'This is a comment'}])!
+
+oid := mydb.calendar.set(o)!
+mut o2 := mydb.calendar.get(oid)!
+
+println('Calendar ID: ${oid}')
+println('Calendar object: ${o2}')
+
+// Add an event to the calendar
+mydb.calendar.add_event(mut &o2, 4)
+mydb.calendar.set(o2)!
+
+println('Calendar after adding event: ${o2}')
+
+mut objects := mydb.calendar.list()!
+println('All calendars: ${objects}')
diff --git a/lib/hero/db/helpers_comments.v b/lib/hero/db/helpers_comments.v
index ec37f65f..c9eb0b1d 100644
--- a/lib/hero/db/helpers_comments.v
+++ b/lib/hero/db/helpers_comments.v
@@ -2,34 +2,6 @@ module db
 
 import crypto.md5
 
-// @[params]
-// pub struct BaseArgs {
-// pub mut:
-// 	id             ?u32
-// 	name           string
-// 	description    string
-// 	securitypolicy ?u32
-// 	tags           []string
-// 	comments       []u32
-// }
-
-// // make it easy to get a base object
-// pub fn (mut self DB) new_base(args BaseArgs) !Base {
-// 	mut redis := redisclient.core_get()!
-
-// 	tags := tags2id(args.tags)!
-
-// 	return Base{
-// 		id:             args.id or { 0 }
-// 		name:           args.name
-// 		description:    args.description
-// 		created_at:     ourtime.now().unix()
-// 		updated_at:     ourtime.now().unix()
-// 		securitypolicy: args.securitypolicy or { 0 }
-// 		tags:           tags
-// 		comments:       args.comments
-// 	}
-// }
 
 @[params]
 pub struct CommentArg {
diff --git a/lib/hero/heromodels/calendar.v b/lib/hero/heromodels/calendar.v
index d6cf8aea..660ed16c 100644
--- a/lib/hero/heromodels/calendar.v
+++ b/lib/hero/heromodels/calendar.v
@@ -1,53 +1,98 @@
 module heromodels
 
+import freeflowuniverse.herolib.data.encoder
 import freeflowuniverse.herolib.data.ourtime
-import time
+import freeflowuniverse.herolib.hero.db
 
 // Calendar represents a collection of events
 @[heap]
 pub struct Calendar {
-	Base
+	db.Base
 pub mut:
-	events    []u32  // IDs of calendar events (changed to u32 to match CalendarEvent)
+	events    []u32  // IDs of calendar events
 	color     string // Hex color code
 	timezone  string
 	is_public bool
 }
 
-@[params]
-pub struct CalendarArgs {
-	BaseArgs
+pub struct DBCalendar {
 pub mut:
-	events    []u32
-	color     string
-	timezone  string
-	is_public bool
+	db &db.DB @[skip; str: skip]
 }
 
-pub fn calendar_new(args CalendarArgs) !Calendar {
-    mut commentids:=[]u32{}
-    mut obj := Calendar{
-        id: args.id or {0} // Will be set by DB?
-        name: args.name
-        description: args.description
-        created_at: ourtime.now().unix()
-        updated_at: ourtime.now().unix()
-        securitypolicy: args.securitypolicy or {0}
-        tags: tags2id(args.tags)!
-        comments: comments2ids(args.comments)!
-        group_id: args.group_id
-        events: args.events
-        color: args.color
-        timezone: args.timezone
-        is_public: args.is_public
-    }
-    return obj
+pub fn (self Calendar) type_name() string {
+	return 'calendar'
 }
 
-pub fn (mut c Calendar) add_event(event_id u32) { // Changed event_id to u32
-	if event_id !in c.events {
-		c.events << event_id
-		c.updated_at = ourtime.now().unix() // Use Base's updated_at
+pub fn (self Calendar) dump(mut e &encoder.Encoder) ! {
+	e.add_list_u32(self.events)
+	e.add_string(self.color)
+	e.add_string(self.timezone)
+	e.add_bool(self.is_public)
+}
+
+fn (mut self DBCalendar) load(mut o Calendar, mut e &encoder.Decoder) ! {
+	o.events = e.get_list_u32()!
+	o.color = e.get_string()!
+	o.timezone = e.get_string()!
+	o.is_public = e.get_bool()!
+}
+
+@[params]
+pub struct CalendarArg {
+pub mut:
+	name        string
+	description string
+	color       string
+	timezone    string
+	is_public   bool
+	events      []u32
+}
+
+// get new calendar, not from the DB
+pub fn (mut self DBCalendar) new(args CalendarArg) !Calendar {
+	mut o := Calendar{
+		color:      args.color
+		timezone:   args.timezone
+		is_public:  args.is_public
+		events:     args.events
+	}
+	
+	// Set base fields
+	o.name = args.name
+	o.description = args.description
+	o.updated_at = ourtime.now().unix()
+	
+	return o
+}
+
+pub fn (mut self DBCalendar) set(o Calendar) !u32 {
+	// Use openrpcserver set function which now returns the ID
+	return self.db.set[Calendar](o)!
+}
+
+pub fn (mut self DBCalendar) delete(id u32) ! {
+	self.db.delete[Calendar](id)!
+}
+
+pub fn (mut self DBCalendar) exist(id u32) !bool {
+	return self.db.exists[Calendar](id)!
+}
+
+pub fn (mut self DBCalendar) get(id u32) !Calendar {
+	mut o, data := self.db.get_data[Calendar](id)!
+	mut e_decoder := encoder.decoder_new(data)
+	self.load(mut o, mut e_decoder)!
+	return o
+}
+
+pub fn (mut self DBCalendar) list() ![]Calendar {
+	return self.db.list[Calendar]()!.map(self.get(it)!)
+}
+
+pub fn (mut self DBCalendar) add_event(mut o &Calendar, event_id u32) {
+	if event_id !in o.events {
+		o.events << event_id
+		o.updated_at = ourtime.now().unix()
 	}
 }
-
diff --git a/lib/hero/heromodels/factory.v b/lib/hero/heromodels/factory.v
index c461a266..8d47ed3b 100644
--- a/lib/hero/heromodels/factory.v
+++ b/lib/hero/heromodels/factory.v
@@ -4,7 +4,8 @@ import freeflowuniverse.herolib.hero.db
 
 pub struct ModelsFactory {
 pub mut:
-	comments DBComments
+	comments  DBComments
+	calendar  DBCalendar
 }
 
 pub fn new() !ModelsFactory {
@@ -13,5 +14,8 @@ pub fn new() !ModelsFactory {
 		comments: DBComments{
 			db: &mydb
 		}
+		calendar: DBCalendar{
+			db: &mydb
+		}
 	}
 }