Plug in string parsing.
Add missing files