Basic phrase folding added. Bugs abound.
Fix existing specs