blah i'm sloppy at this adding commits - forgot a couple