More work on b calendar.