think i got it
still merging apparently