week5 and some accidental other stuff