I would put these two steps into the calendar object itself- there are other steps which we probably will need to add to the initialization code eventually.