the last remaining issue is figuring out what ivy resolves will look like, then i'll get this out for review