week 2 ready.

there are still a lot of commits here. sorry