Refactored make_matches method next need to put it into the exchange model
Commit before moving dev to postgreSQL