Month view doesn't work yet… fixing conflicts