Follow up to previous commit
First implementation of object matching.