Shoring up WHERE and MATCH
A start on START and RETURN