Modularization of YY. One test still not working.