New implementation of wye. Tests not passing.