add comments and calendar scaffold