Switched everything to use Text