Adding the latest source with finished part 1 of task 2