Add ability to exclude some (current) years from Baseline matrix construction