added week 2 stuff and more