Finished building out for Task 1