Fleshing out scanners a bit