Started working on text and added a bit more on logic