Simplify matching logic
Added mach.serve

I think I prefer using this over the mach.Server approach, but we
should probably talk about it.