moved stuff around
added week7 capacity