wip i think i made p
cleaning up if statement