More refactor and some events now appearing in the month view.