Actually tested the scanner changes and made it work... shockingly small amount of changes