task 1,2,4,6,7 updates
Clean up 6,8,9 need work
Clean up 6,8,9 need work