Most ugly commit, but got some scanner things working.