Task 2 basecode and some changes