task 3 and 4 ish done