Calendar ready

please test and comment