New scanner mostly working, but not quite