worked on 3
almost done
fixin merge