lots of changes to support new UI for creating matches