Big commit

Week 1 & 2 stuff