Moved text stuff to seperate module