Further work on entity resolution. Still having issues with interfaces...