Scanner integration complete

Next step to mmerge with master