wip: Promote new scanner..