Added Text class; some tweaks need to be made.