Progress on week mode. Not yet complete.