Convert to using Text internally

- Should still refactor some of the parsing code