Adding match table and scaffolding