draft scan and match support
working scan and match support