Working on adding more support to the WYCS logic.