Task 1 mainly finished