Redid a bunch more ivy stuff