Some work on week 0 part 3