added first bit of text parsing
fixed merge