Reorganizing things so texty is more like the real thing