Add match scaffolding and service