Finished implementing task 1