Week 3 & 5 stuff
Merge fix