More refactoring. Not building yet still need pass in NSAttributedText into message view