Continuing work on schedule calendar