all the things in one commit because Im a bad person