Rebuilt project and caught it up to week 3