redid everything
redid a lot