Some progress on the month switcher