Added more stuff to task 3