Move matchmaker into own controller