Feature/better matching

Actually update the things so others can use it.