New version

New version using classes, words work but have a bug with showing the underlines