Start refactoring to a more "useful" architecture (month overlay not done yet)