more work on text refactor
yet more text refactor