Added support for map selection and to actually run matches