Task 2 - just about done? maybe.