Task 2: Initial commit - copied from task 1