Make calcweeks use stubbed now too