Got shonky old text handling working again