Updated with week 2 stuff