ongoing calendar work (#924)