More progress with task 1