Add delimitmate. Still on the fence about this