Some work on ivy stuff