Added weekday dimension.  More difficult than it should have been.