Fixed addDialog, tried to impliment highlighting
Files meant to go with last commit