Initial implementation of ellipsis matching