Moved more stuff to the text drawing class
Moved more stuff to the text drawing class, part 2
Moved items to a Cling drawer class