week7

Done for now, talking to prof on Monday.