Move stuff into packages
Use database to look up existing matches by their match request ID