Task 2 WIP almost done