redid everything
droppin in