Fairly major overhaul of the text system
Clean up