Text display working mostly
Merged