the api change kinda made it sloppy im trying to sort it out