More work towards completing the tutorial