WYCS: making progress on using the new structured parser.
WYCS: working through test cases.