More work on supporting longer text; only chunked still missing