commiting for possible merge conflicts
Fixed conflicts
Added logic to making suggestion. Still some errors. Need dialog box