change some of the messages
merge to commit
everything works (Except the print statements cause some fails)