Add calendar implementation
checkpoint