Added Weeks func & started facilities work