Add first version of servicematch.
Fix whitespace.