redid all the stuff git deleted :(