beginning to clean up the yarn intergration