redid everything in one commit because Im a terrible person.