scanner prolly done, need tests; saviour backup commit