More dev to match part 4 of the tut