Move stuff out of the DayCalculator and make that one able to work with the baseline classes instead of just the Germans